tabmdi menu fix

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

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index 78f618e0a459465f0e04f810df200d892d4c8df9..0f303edf647c5394309c52e9f8fa9dcfffddb70f 100644 (file)
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -132,7 +132,7 @@ void wxTabMDIParentFrame::SetWindowMenu(wxMenu* pMenu)
     }
 }
 
     }
 }
 

-void wxTabMDIParentFrame::SetMenuBar(wxMenuBar *pMenuBar)
+void wxTabMDIParentFrame::SetMenuBar(wxMenuBar* pMenuBar)

 {
     // Remove the Window menu from the old menu bar
     RemoveWindowMenu(GetMenuBar());
 {
     // Remove the Window menu from the old menu bar
     RemoveWindowMenu(GetMenuBar());


@@ -154,13 +154,13 @@ void wxTabMDIParentFrame::SetChildMenuBar(wxTabMDIChildFrame* pChild)
         SetMenuBar(m_pMyMenuBar);
 
         // Make sure we know our menu bar is in use
         SetMenuBar(m_pMyMenuBar);
 
         // Make sure we know our menu bar is in use

-        m_pMyMenuBar = NULL;
+        //m_pMyMenuBar = NULL;

     }
      else
     {
         if (pChild->GetMenuBar() == NULL)
             return;
     }
      else
     {
         if (pChild->GetMenuBar() == NULL)
             return;

-
+            

         // Do we need to save the current bar?
         if (m_pMyMenuBar == NULL)
             m_pMyMenuBar = GetMenuBar();
         // Do we need to save the current bar?
         if (m_pMyMenuBar == NULL)
             m_pMyMenuBar = GetMenuBar();