From 82dc21d343fcdb417d950fa96cce799e13b94524 Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Mon, 24 Jul 2006 08:40:08 +0000 Subject: [PATCH] tabmdi menu fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/aui/tabmdi.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp index 78f618e0a4..0f303edf64 100644 --- 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()); @@ -154,13 +154,13 @@ void wxTabMDIParentFrame::SetChildMenuBar(wxTabMDIChildFrame* pChild) 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; - + // Do we need to save the current bar? if (m_pMyMenuBar == NULL) m_pMyMenuBar = GetMenuBar(); -- 2.45.2