wxMDIChildFrame::DetachMenuBar() to fix SF bug 1232271
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -191,6 +191,7 @@ protected:
|
||||
private:
|
||||
bool m_needsInitialShow; // Show must be called in idle time after Creation
|
||||
bool m_needsResize; // flag which tells us to artificially resize the frame
|
||||
virtual void DetachMenuBar() ;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)
|
||||
|
@@ -850,6 +850,12 @@ void wxMDIChildFrame::InternalSetMenuBar()
|
||||
parent->m_parentFrameActive = false;
|
||||
}
|
||||
|
||||
void wxMDIChildFrame::DetachMenuBar()
|
||||
{
|
||||
RemoveWindowMenu(NULL, m_hMenu);
|
||||
wxFrame::DetachMenuBar();
|
||||
}
|
||||
|
||||
WXHICON wxMDIChildFrame::GetDefaultIcon() const
|
||||
{
|
||||
// we don't have any standard icons (any more)
|
||||
@@ -1377,11 +1383,6 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Window")) )
|
||||
{
|
||||
success = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) )
|
||||
{
|
||||
|
Reference in New Issue
Block a user