tabmdi menu fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
8efb290702
commit
82dc21d343
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user