updated setup.h for OpenVMS

[wxWidgets.git] / src / common / menucmn.cpp

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 7c539e35acec5bee3f752792ae2978053ea7aa8a..f34a5bf0f6b43ce247da9a2c2a136f7fcfd9e0f8 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -60,11 +60,13 @@ wxEND_FLAGS( wxMenuStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler, "wx/menu.h")
 wxCOLLECTION_TYPE_INFO( wxMenuItem *, wxMenuItemList ) ;
 
+#if wxUSE_EXTENDED_RTTI    
 template<> void wxCollectionToVariantArray( wxMenuItemList const &theList,
                                            wxAnyList &value)
 {
     wxListCollectionToAnyList<wxMenuItemList::compatibility_iterator>( theList, value ) ;
 }
+#endif
 
 wxBEGIN_PROPERTIES_TABLE(wxMenu)
 wxEVENT_PROPERTY( Select, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)
@@ -90,6 +92,7 @@ wxBEGIN_FLAGS( wxMenuBarStyle )
 wxFLAGS_MEMBER(wxMB_DOCKABLE)
 wxEND_FLAGS( wxMenuBarStyle )
 
+#if wxUSE_EXTENDED_RTTI    
 // the negative id would lead the window (its superclass !) to
 // vetoe streaming out otherwise
 bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWriter *,
@@ -97,6 +100,7 @@ bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWrite
 {
     return true;
 }
+#endif
 
 wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \
                                        wxMenuBarStreamingCallback)
@@ -155,15 +159,6 @@ const wxMenuInfoHelperList& wxMenuBarBase::GetMenuInfos() const
 
 #endif
 
-wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
-wxPROPERTY_COLLECTION( MenuInfos, wxMenuInfoList, wxMenuInfo*, AppendMenuInfo, \
-                      GetMenuInfos, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxMenuBar)
-
-wxCONSTRUCTOR_DUMMY( wxMenuBar )
-
 // ----------------------------------------------------------------------------
 // XTI for wxMenuItem
 // ----------------------------------------------------------------------------
@@ -228,13 +223,13 @@ wxDIRECT_CONSTRUCTOR_6( wxMenuItem, wxMenu*, Parent, int, Id, wxString, \
 // ----------------------------------------------------------------------------
 
 wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
-                               int id,
+                               int itemid,
                                const wxString& text,
                                const wxString& help,
                                wxItemKind kind,
                                wxMenu *subMenu)
 {
-    switch ( id )
+    switch ( itemid )
     {
         case wxID_ANY:
             m_id = wxWindow::NewControlId();
@@ -254,17 +249,17 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
             // (popup) menu titles in wxMSW use this ID to indicate that
             // it's not a real menu item, so we don't want the check below to
             // apply to it
-            m_id = id;
+            m_id = itemid;
             break;
 
         default:
             // ids are limited to 16 bits under MSW so portable code shouldn't
             // use ids outside of this range (negative ids generated by wx are
             // fine though)
-            wxASSERT_MSG( (id >= 0 && id < SHRT_MAX) ||
-                            (id >= wxID_AUTO_LOWEST && id <= wxID_AUTO_HIGHEST),
-                          wxS("invalid id value") );
-            m_id = id;
+            wxASSERT_MSG( (itemid >= 0 && itemid < SHRT_MAX) ||
+                            (itemid >= wxID_AUTO_LOWEST && itemid <= wxID_AUTO_HIGHEST),
+                          wxS("invalid itemid value") );
+            m_id = itemid;
     }
 
     // notice that parentMenu can be NULL: the item can be attached to the menu
@@ -558,7 +553,7 @@ wxMenuItem *wxMenuBase::FindItem(int itemId, wxMenu **itemMenu) const
 }
 
 // non recursive search
-wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const
+wxMenuItem *wxMenuBase::FindChildItem(int itemid, size_t *ppos) const
 {
     wxMenuItem *item = NULL;
     wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
@@ -566,7 +561,7 @@ wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const
     size_t pos;
     for ( pos = 0; node; pos++ )
     {
-        if ( node->GetData()->GetId() == id )
+        if ( node->GetData()->GetId() == itemid )
         {
             item = node->GetData();
 
@@ -602,17 +597,10 @@ wxMenuItem* wxMenuBase::FindItemByPosition(size_t position) const
 // window will be used.
 void wxMenuBase::UpdateUI(wxEvtHandler* source)
 {
-    if (GetInvokingWindow())
-    {
-        // Don't update menus if the parent
-        // frame is about to get deleted
-        wxWindow *tlw = wxGetTopLevelParent( GetInvokingWindow() );
-        if (tlw && wxPendingDelete.Member(tlw))
-            return;
-    }
+    wxWindow * const win = GetWindow();
 
-    if ( !source && GetInvokingWindow() )
-        source = GetInvokingWindow()->GetEventHandler();
+    if ( !source && win )
+        source = win->GetEventHandler();
     if ( !source )
         source = GetEventHandler();
     if ( !source )
@@ -624,19 +612,19 @@ void wxMenuBase::UpdateUI(wxEvtHandler* source)
         wxMenuItem* item = node->GetData();
         if ( !item->IsSeparator() )
         {
-            wxWindowID id = item->GetId();
-            wxUpdateUIEvent event(id);
-            event.SetEventObject( source );
+            wxWindowID itemid = item->GetId();
+            wxUpdateUIEvent event(itemid);
+            event.SetEventObject( this );
 
             if ( source->ProcessEvent(event) )
             {
                 // if anything changed, update the changed attribute
                 if (event.GetSetText())
-                    SetLabel(id, event.GetText());
+                    SetLabel(itemid, event.GetText());
                 if (event.GetSetChecked())
-                    Check(id, event.GetChecked());
+                    Check(itemid, event.GetChecked());
                 if (event.GetSetEnabled())
-                    Enable(id, event.GetEnabled());
+                    Enable(itemid, event.GetEnabled());
             }
 
             // recurse to the submenus
@@ -649,9 +637,9 @@ void wxMenuBase::UpdateUI(wxEvtHandler* source)
     }
 }
 
-bool wxMenuBase::SendEvent(int id, int checked)
+bool wxMenuBase::SendEvent(int itemid, int checked)
 {
-    wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, id);
+    wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, itemid);
     event.SetEventObject(this);
     event.SetInt(checked);
 
@@ -735,72 +723,72 @@ wxWindow *wxMenuBase::GetWindow() const
 // wxMenu functions forwarded to wxMenuItem
 // ----------------------------------------------------------------------------
 
-void wxMenuBase::Enable( int id, bool enable )
+void wxMenuBase::Enable( int itemid, bool enable )
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") );
 
     item->Enable(enable);
 }
 
-bool wxMenuBase::IsEnabled( int id ) const
+bool wxMenuBase::IsEnabled( int itemid ) const
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_MSG( item, false, wxT("wxMenu::IsEnabled: no such item") );
 
     return item->IsEnabled();
 }
 
-void wxMenuBase::Check( int id, bool enable )
+void wxMenuBase::Check( int itemid, bool enable )
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_RET( item, wxT("wxMenu::Check: no such item") );
 
     item->Check(enable);
 }
 
-bool wxMenuBase::IsChecked( int id ) const
+bool wxMenuBase::IsChecked( int itemid ) const
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_MSG( item, false, wxT("wxMenu::IsChecked: no such item") );
 
     return item->IsChecked();
 }
 
-void wxMenuBase::SetLabel( int id, const wxString &label )
+void wxMenuBase::SetLabel( int itemid, const wxString &label )
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") );
 
     item->SetItemLabel(label);
 }
 
-wxString wxMenuBase::GetLabel( int id ) const
+wxString wxMenuBase::GetLabel( int itemid ) const
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetLabel: no such item") );
 
     return item->GetItemLabel();
 }
 
-void wxMenuBase::SetHelpString( int id, const wxString& helpString )
+void wxMenuBase::SetHelpString( int itemid, const wxString& helpString )
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") );
 
     item->SetHelp( helpString );
 }
 
-wxString wxMenuBase::GetHelpString( int id ) const
+wxString wxMenuBase::GetHelpString( int itemid ) const
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetHelpString: no such item") );
 
@@ -938,7 +926,7 @@ void wxMenuBarBase::Detach()
 // wxMenuBar searching for items
 // ----------------------------------------------------------------------------
 
-wxMenuItem *wxMenuBarBase::FindItem(int id, wxMenu **menu) const
+wxMenuItem *wxMenuBarBase::FindItem(int itemid, wxMenu **menu) const
 {
     if ( menu )
         *menu = NULL;
@@ -948,7 +936,7 @@ wxMenuItem *wxMenuBarBase::FindItem(int id, wxMenu **menu) const
     wxMenuList::const_iterator it;
     for ( i = 0, it = m_menus.begin(); !item && (i < count); i++, it++ )
     {
-        item = (*it)->FindItem(id, menu);
+        item = (*it)->FindItem(itemid, menu);
     }
 
     return item;
@@ -973,18 +961,18 @@ int wxMenuBarBase::FindMenuItem(const wxString& menu, const wxString& item) cons
 // wxMenuBar functions forwarded to wxMenuItem
 // ---------------------------------------------------------------------------
 
-void wxMenuBarBase::Enable(int id, bool enable)
+void wxMenuBarBase::Enable(int itemid, bool enable)
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_RET( item, wxT("attempt to enable an item which doesn't exist") );
 
     item->Enable(enable);
 }
 
-void wxMenuBarBase::Check(int id, bool check)
+void wxMenuBarBase::Check(int itemid, bool check)
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_RET( item, wxT("attempt to check an item which doesn't exist") );
     wxCHECK_RET( item->IsCheckable(), wxT("attempt to check an uncheckable item") );
@@ -992,36 +980,36 @@ void wxMenuBarBase::Check(int id, bool check)
     item->Check(check);
 }
 
-bool wxMenuBarBase::IsChecked(int id) const
+bool wxMenuBarBase::IsChecked(int itemid) const
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_MSG( item, false, wxT("wxMenuBar::IsChecked(): no such item") );
 
     return item->IsChecked();
 }
 
-bool wxMenuBarBase::IsEnabled(int id) const
+bool wxMenuBarBase::IsEnabled(int itemid) const
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_MSG( item, false, wxT("wxMenuBar::IsEnabled(): no such item") );
 
     return item->IsEnabled();
 }
 
-void wxMenuBarBase::SetLabel(int id, const wxString& label)
+void wxMenuBarBase::SetLabel(int itemid, const wxString& label)
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_RET( item, wxT("wxMenuBar::SetLabel(): no such item") );
 
     item->SetItemLabel(label);
 }
 
-wxString wxMenuBarBase::GetLabel(int id) const
+wxString wxMenuBarBase::GetLabel(int itemid) const
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_MSG( item, wxEmptyString,
                  wxT("wxMenuBar::GetLabel(): no such item") );
@@ -1029,18 +1017,18 @@ wxString wxMenuBarBase::GetLabel(int id) const
     return item->GetItemLabel();
 }
 
-void wxMenuBarBase::SetHelpString(int id, const wxString& helpString)
+void wxMenuBarBase::SetHelpString(int itemid, const wxString& helpString)
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString(): no such item") );
 
     item->SetHelp(helpString);
 }
 
-wxString wxMenuBarBase::GetHelpString(int id) const
+wxString wxMenuBarBase::GetHelpString(int itemid) const
 {
-    wxMenuItem *item = FindItem(id);
+    wxMenuItem *item = FindItem(itemid);
 
     wxCHECK_MSG( item, wxEmptyString,
                  wxT("wxMenuBar::GetHelpString(): no such item") );
@@ -1050,18 +1038,13 @@ wxString wxMenuBarBase::GetHelpString(int id) const
 
 void wxMenuBarBase::UpdateMenus()
 {
-    wxEvtHandler* source;
     wxMenu* menu;
     int nCount = GetMenuCount();
     for (int n = 0; n < nCount; n++)
     {
         menu = GetMenu( n );
         if (menu != NULL)
-        {
-            source = menu->GetEventHandler();
-            if (source != NULL)
-                menu->UpdateUI( source );
-        }
+            menu->UpdateUI( NULL );
     }
 }