Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMDIChildFrame::DetachMenuBar() to fix SF bug 1232271

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2005-07-29 13:41:49 +00:00
parent 867f2ca48e
commit e3307dddec
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/msw/mdi.h
View File

@@ -191,6 +191,7 @@ protected:
private: private:
bool m_needsInitialShow; // Show must be called in idle time after Creation bool m_needsInitialShow; // Show must be called in idle time after Creation
bool m_needsResize; // flag which tells us to artificially resize the frame bool m_needsResize; // flag which tells us to artificially resize the frame
virtual void DetachMenuBar() ;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame) DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)

11
src/msw/mdi.cpp
View File

@@ -850,6 +850,12 @@ void wxMDIChildFrame::InternalSetMenuBar()
parent->m_parentFrameActive = false; parent->m_parentFrameActive = false;
} }
void wxMDIChildFrame::DetachMenuBar()
{
RemoveWindowMenu(NULL, m_hMenu);
wxFrame::DetachMenuBar();
}
WXHICON wxMDIChildFrame::GetDefaultIcon() const WXHICON wxMDIChildFrame::GetDefaultIcon() const
{ {
// we don't have any standard icons (any more) // we don't have any standard icons (any more)
@@ -1377,11 +1383,6 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
continue; continue;
} }
if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Window")) )
{
success = true;
break;
}
if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) ) if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) )
{ {