don't set wxMenu::m_menuBar when appending the menu to menubar as otherwise an assert...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 82193e0cceccc507926f455329c91f3988364b40..6ec02dd1b5895e5dc4c3202215643c373867e11a 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -289,8 +289,6 @@ bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
         menu->SetButtonWidget(w);
     }
 
         menu->SetButtonWidget(w);
     }
 

-    //menu->SetMenuBar(this);
-

     m_titles.Add(title);
 
     return wxMenuBarBase::Append(menu, title);
     m_titles.Add(title);
 
     return wxMenuBarBase::Append(menu, title);


@@ -522,7 +520,6 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
 
     m_menuWidget = (WXWidget) menu;
 
 
     m_menuWidget = (WXWidget) menu;
 

-    m_menuBar = menuBar;

     m_topLevelMenu = topMenu;
 
     for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
     m_topLevelMenu = topMenu;
 
     for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();