fixing overrelease and out-of-bounds write, fixes #13725

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index c556c59c2d2f46d1e7c3ddb25abdee4544e6f863..f34a5bf0f6b43ce247da9a2c2a136f7fcfd9e0f8 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -52,10 +52,6 @@ WX_DEFINE_LIST(wxMenuItemList)
 // XTI for wxMenu(Bar)
 // ----------------------------------------------------------------------------
 
 // XTI for wxMenu(Bar)
 // ----------------------------------------------------------------------------
 

-#if wxUSE_EXTENDED_RTTI
-
-WX_DEFINE_LIST( wxMenuInfoList )
-

 wxDEFINE_FLAGS( wxMenuStyle )
 wxBEGIN_FLAGS( wxMenuStyle )
 wxFLAGS_MEMBER(wxMENU_TEAROFF)
 wxDEFINE_FLAGS( wxMenuStyle )
 wxBEGIN_FLAGS( wxMenuStyle )
 wxFLAGS_MEMBER(wxMENU_TEAROFF)


@@ -64,11 +60,13 @@ wxEND_FLAGS( wxMenuStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler, "wx/menu.h")
 wxCOLLECTION_TYPE_INFO( wxMenuItem *, wxMenuItemList ) ;
 
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler, "wx/menu.h")
 wxCOLLECTION_TYPE_INFO( wxMenuItem *, wxMenuItemList ) ;
 

+#if wxUSE_EXTENDED_RTTI    

 template<> void wxCollectionToVariantArray( wxMenuItemList const &theList,
 template<> void wxCollectionToVariantArray( wxMenuItemList const &theList,

-                                           wxVariantBaseArray &value)
+                                           wxAnyList &value)

 {
 {

-    wxListCollectionToVariantArray<wxMenuItemList::compatibility_iterator>( theList, value ) ;
+    wxListCollectionToAnyList<wxMenuItemList::compatibility_iterator>( theList, value ) ;

 }
 }

+#endif

 
 wxBEGIN_PROPERTIES_TABLE(wxMenu)
 wxEVENT_PROPERTY( Select, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)
 
 wxBEGIN_PROPERTIES_TABLE(wxMenu)
 wxEVENT_PROPERTY( Select, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)


@@ -94,20 +92,26 @@ wxBEGIN_FLAGS( wxMenuBarStyle )
 wxFLAGS_MEMBER(wxMB_DOCKABLE)
 wxEND_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 *,
 // the negative id would lead the window (its superclass !) to
 // vetoe streaming out otherwise
 bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWriter *,

-                                wxObjectReaderCallback *, wxVariantBaseArray & )
+                                wxObjectWriterCallback *, const wxStringToAnyHashMap & )

 {
     return true;
 }
 {
     return true;
 }

+#endif

 
 wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \
                                        wxMenuBarStreamingCallback)
 
 
 wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \
                                        wxMenuBarStreamingCallback)
 

-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfo, wxObject, "wx/menu.h")

 
 

-wxBEGIN_PROPERTIES_TABLE(wxMenuInfo)
+#if wxUSE_EXTENDED_RTTI    
+WX_DEFINE_LIST( wxMenuInfoHelperList )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfoHelper, wxObject, "wx/menu.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxMenuInfoHelper)

 wxREADONLY_PROPERTY( Menu, wxMenu*, GetMenu, wxEMPTY_PARAMETER_VALUE, \
                     0 /*flags*/, wxT("Helpstring"), wxT("group"))
 
 wxREADONLY_PROPERTY( Menu, wxMenu*, GetMenu, wxEMPTY_PARAMETER_VALUE, \
                     0 /*flags*/, wxT("Helpstring"), wxT("group"))
 


@@ -115,20 +119,22 @@ wxREADONLY_PROPERTY( Title, wxString, GetTitle, wxString(), \
                     0 /*flags*/, wxT("Helpstring"), wxT("group"))
 wxEND_PROPERTIES_TABLE()
 
                     0 /*flags*/, wxT("Helpstring"), wxT("group"))
 wxEND_PROPERTIES_TABLE()
 

-wxEMPTY_HANDLERS_TABLE(wxMenuInfo)
+wxEMPTY_HANDLERS_TABLE(wxMenuInfoHelper)

 
 

-wxCONSTRUCTOR_2( wxMenuInfo, wxMenu*, Menu, wxString, Title )
+wxCONSTRUCTOR_2( wxMenuInfoHelper, wxMenu*, Menu, wxString, Title )

 
 

-wxCOLLECTION_TYPE_INFO( wxMenuInfo *, wxMenuInfoList ) ;
+wxCOLLECTION_TYPE_INFO( wxMenuInfoHelper *, wxMenuInfoHelperList ) ;

 
 

-template<> void wxCollectionToVariantArray( wxMenuInfoList const &theList, 
-                                           wxVariantBaseArray &value)
+template<> void wxCollectionToVariantArray( wxMenuInfoHelperList const &theList, 
+                                           wxAnyList &value)

 {
 {

-    wxListCollectionToVariantArray<wxMenuInfoList::compatibility_iterator>( theList, value ) ;
+    wxListCollectionToAnyList<wxMenuInfoHelperList::compatibility_iterator>( theList, value ) ;

 }
 
 }
 

+#endif
+

 wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
 wxBEGIN_PROPERTIES_TABLE(wxMenuBar)

-wxPROPERTY_COLLECTION( MenuInfos, wxMenuInfoList, wxMenuInfo*, AppendMenuInfo, \
+wxPROPERTY_COLLECTION( MenuInfos, wxMenuInfoHelperList, wxMenuInfoHelper*, AppendMenuInfo, \

                       GetMenuInfos, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
 wxEND_PROPERTIES_TABLE()
 
                       GetMenuInfos, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
 wxEND_PROPERTIES_TABLE()
 


@@ -136,12 +142,22 @@ wxEMPTY_HANDLERS_TABLE(wxMenuBar)
 
 wxCONSTRUCTOR_DUMMY( wxMenuBar )
 
 
 wxCONSTRUCTOR_DUMMY( wxMenuBar )
 

-#else
-// IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
-// IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
-// IMPLEMENT_DYNAMIC_CLASS(wxMenuInfo, wxObject)
-#endif
+#if wxUSE_EXTENDED_RTTI    

 
 

+const wxMenuInfoHelperList& wxMenuBarBase::GetMenuInfos() const
+{
+    wxMenuInfoHelperList* list = const_cast< wxMenuInfoHelperList* > (& m_menuInfos);
+    WX_CLEAR_LIST( wxMenuInfoHelperList, *list);
+    for (size_t i = 0 ; i < GetMenuCount(); ++i)
+    {
+        wxMenuInfoHelper* info = new wxMenuInfoHelper();
+        info->Create( GetMenu(i), GetMenuLabel(i));
+        list->Append(info);
+    }
+    return m_menuInfos;
+}
+
+#endif

 
 // ----------------------------------------------------------------------------
 // XTI for wxMenuItem
 
 // ----------------------------------------------------------------------------
 // XTI for wxMenuItem


@@ -150,7 +166,7 @@ wxCONSTRUCTOR_DUMMY( wxMenuBar )
 #if wxUSE_EXTENDED_RTTI
 
 bool wxMenuItemStreamingCallback( const wxObject *object, wxObjectWriter *,
 #if wxUSE_EXTENDED_RTTI
 
 bool wxMenuItemStreamingCallback( const wxObject *object, wxObjectWriter *,

-                                 wxObjectReaderCallback *, wxVariantBaseArray & )
+                                 wxObjectWriterCallback *, const wxStringToAnyHashMap & )

 {
     const wxMenuItem * mitem = wx_dynamic_cast(const wxMenuItem*, object);
     if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().empty() )
 {
     const wxMenuItem * mitem = wx_dynamic_cast(const wxMenuItem*, object);
     if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().empty() )


@@ -164,6 +180,8 @@ bool wxMenuItemStreamingCallback( const wxObject *object, wxObjectWriter *,
     return true;
 }
 
     return true;
 }
 

+#endif
+

 wxBEGIN_ENUM( wxItemKind )
 wxENUM_MEMBER( wxITEM_SEPARATOR )
 wxENUM_MEMBER( wxITEM_NORMAL )
 wxBEGIN_ENUM( wxItemKind )
 wxENUM_MEMBER( wxITEM_SEPARATOR )
 wxENUM_MEMBER( wxITEM_NORMAL )


@@ -179,7 +197,7 @@ wxPROPERTY( Parent, wxMenu*, SetMenu, GetMenu, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("Helpstring"), wxT("group") )
 wxPROPERTY( Id, int, SetId, GetId, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("Helpstring"), wxT("group") )
            0 /*flags*/, wxT("Helpstring"), wxT("group") )
 wxPROPERTY( Id, int, SetId, GetId, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("Helpstring"), wxT("group") )

-wxPROPERTY( Text, wxString, SetText, GetText, wxString(), \
+wxPROPERTY( ItemLabel, wxString, SetItemLabel, GetItemLabel, wxString(), \

            0 /*flags*/, wxT("Helpstring"), wxT("group") )
 wxPROPERTY( Help, wxString, SetHelp, GetHelp, wxString(), \
            0 /*flags*/, wxT("Helpstring"), wxT("group") )
            0 /*flags*/, wxT("Helpstring"), wxT("group") )
 wxPROPERTY( Help, wxString, SetHelp, GetHelp, wxString(), \
            0 /*flags*/, wxT("Helpstring"), wxT("group") )


@@ -187,11 +205,11 @@ wxREADONLY_PROPERTY( Kind, wxItemKind, GetKind, wxEMPTY_PARAMETER_VALUE, \
                     0 /*flags*/, wxT("Helpstring"), wxT("group") )
 wxPROPERTY( SubMenu, wxMenu*, SetSubMenu, GetSubMenu, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("Helpstring"), wxT("group") )
                     0 /*flags*/, wxT("Helpstring"), wxT("group") )
 wxPROPERTY( SubMenu, wxMenu*, SetSubMenu, GetSubMenu, wxEMPTY_PARAMETER_VALUE, \
            0 /*flags*/, wxT("Helpstring"), wxT("group") )

-wxPROPERTY( Enabled, bool, Enable, IsEnabled, wxVariantBase((bool)true), \
+wxPROPERTY( Enabled, bool, Enable, IsEnabled, wxAny((bool)true), \

            0 /*flags*/, wxT("Helpstring"), wxT("group") )
            0 /*flags*/, wxT("Helpstring"), wxT("group") )

-wxPROPERTY( Checked, bool, Check, IsChecked, wxVariantBase((bool)false), \
+wxPROPERTY( Checked, bool, Check, IsChecked, wxAny((bool)false), \

            0 /*flags*/, wxT("Helpstring"), wxT("group") )
            0 /*flags*/, wxT("Helpstring"), wxT("group") )

-wxPROPERTY( Checkable, bool, SetCheckable, IsCheckable, wxVariantBase((bool)false), \
+wxPROPERTY( Checkable, bool, SetCheckable, IsCheckable, wxAny((bool)false), \

            0 /*flags*/, wxT("Helpstring"), wxT("group") )
 wxEND_PROPERTIES_TABLE()
 
            0 /*flags*/, wxT("Helpstring"), wxT("group") )
 wxEND_PROPERTIES_TABLE()
 


@@ -199,22 +217,19 @@ wxEMPTY_HANDLERS_TABLE(wxMenuItem)
 
 wxDIRECT_CONSTRUCTOR_6( wxMenuItem, wxMenu*, Parent, int, Id, wxString, \
                        Text, wxString, Help, wxItemKind, Kind, wxMenu*, SubMenu )
 
 wxDIRECT_CONSTRUCTOR_6( wxMenuItem, wxMenu*, Parent, int, Id, wxString, \
                        Text, wxString, Help, wxItemKind, Kind, wxMenu*, SubMenu )

-#else
-//IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-#endif

 
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 // ----------------------------------------------------------------------------
 
 wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
 
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 // ----------------------------------------------------------------------------
 
 wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,

-                               int id,
+                               int itemid,

                                const wxString& text,
                                const wxString& help,
                                wxItemKind kind,
                                wxMenu *subMenu)
 {
                                const wxString& text,
                                const wxString& help,
                                wxItemKind kind,
                                wxMenu *subMenu)
 {

-    switch ( id )
+    switch ( itemid )

     {
         case wxID_ANY:
             m_id = wxWindow::NewControlId();
     {
         case wxID_ANY:
             m_id = wxWindow::NewControlId();


@@ -234,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
             // (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)
             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
     }
 
     // notice that parentMenu can be NULL: the item can be attached to the menu


@@ -538,7 +553,7 @@ wxMenuItem *wxMenuBase::FindItem(int itemId, wxMenu **itemMenu) const
 }
 
 // non recursive search
 }
 
 // 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();
 {
     wxMenuItem *item = NULL;
     wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();


@@ -546,7 +561,7 @@ wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const
     size_t pos;
     for ( pos = 0; node; pos++ )
     {
     size_t pos;
     for ( pos = 0; node; pos++ )
     {

-        if ( node->GetData()->GetId() == id )
+        if ( node->GetData()->GetId() == itemid )

         {
             item = node->GetData();
 
         {
             item = node->GetData();
 


@@ -582,17 +597,10 @@ wxMenuItem* wxMenuBase::FindItemByPosition(size_t position) const
 // window will be used.
 void wxMenuBase::UpdateUI(wxEvtHandler* source)
 {
 // 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 )
     if ( !source )
         source = GetEventHandler();
     if ( !source )


@@ -604,19 +612,19 @@ void wxMenuBase::UpdateUI(wxEvtHandler* source)
         wxMenuItem* item = node->GetData();
         if ( !item->IsSeparator() )
         {
         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())
 
             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())
                 if (event.GetSetChecked())

-                    Check(id, event.GetChecked());
+                    Check(itemid, event.GetChecked());

                 if (event.GetSetEnabled())
                 if (event.GetSetEnabled())

-                    Enable(id, event.GetEnabled());
+                    Enable(itemid, event.GetEnabled());

             }
 
             // recurse to the submenus
             }
 
             // recurse to the submenus


@@ -629,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);
 
     event.SetEventObject(this);
     event.SetInt(checked);
 


@@ -715,72 +723,72 @@ wxWindow *wxMenuBase::GetWindow() const
 // wxMenu functions forwarded to wxMenuItem
 // ----------------------------------------------------------------------------
 
 // 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);
 }
 
 
     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();
 }
 
 
     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);
 }
 
 
     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();
 }
 
 
     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);
 }
 
 
     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();
 }
 
 
     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 );
 }
 
 
     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") );
 
 
     wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetHelpString: no such item") );
 


@@ -918,7 +926,7 @@ void wxMenuBarBase::Detach()
 // wxMenuBar searching for items
 // ----------------------------------------------------------------------------
 
 // wxMenuBar searching for items
 // ----------------------------------------------------------------------------
 

-wxMenuItem *wxMenuBarBase::FindItem(int id, wxMenu **menu) const
+wxMenuItem *wxMenuBarBase::FindItem(int itemid, wxMenu **menu) const

 {
     if ( menu )
         *menu = NULL;
 {
     if ( menu )
         *menu = NULL;


@@ -928,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++ )
     {
     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;
     }
 
     return item;


@@ -953,18 +961,18 @@ int wxMenuBarBase::FindMenuItem(const wxString& menu, const wxString& item) cons
 // wxMenuBar functions forwarded to wxMenuItem
 // ---------------------------------------------------------------------------
 
 // 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);
 }
 
 
     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") );
 
     wxCHECK_RET( item, wxT("attempt to check an item which doesn't exist") );
     wxCHECK_RET( item->IsCheckable(), wxT("attempt to check an uncheckable item") );


@@ -972,36 +980,36 @@ void wxMenuBarBase::Check(int id, bool check)
     item->Check(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();
 }
 
 
     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();
 }
 
 
     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);
 }
 
 
     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") );
 
     wxCHECK_MSG( item, wxEmptyString,
                  wxT("wxMenuBar::GetLabel(): no such item") );


@@ -1009,18 +1017,18 @@ wxString wxMenuBarBase::GetLabel(int id) const
     return item->GetItemLabel();
 }
 
     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);
 }
 
 
     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") );
 
     wxCHECK_MSG( item, wxEmptyString,
                  wxT("wxMenuBar::GetHelpString(): no such item") );


@@ -1030,18 +1038,13 @@ wxString wxMenuBarBase::GetHelpString(int id) const
 
 void wxMenuBarBase::UpdateMenus()
 {
 
 void wxMenuBarBase::UpdateMenus()
 {

-    wxEvtHandler* source;

     wxMenu* menu;
     int nCount = GetMenuCount();
     for (int n = 0; n < nCount; n++)
     {
         menu = GetMenu( n );
         if (menu != NULL)
     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 );

     }
 }
 
     }
 }