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

applied patch 403988 (fixing MDI window menu)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-02-26 10:24:24 +00:00
parent 186ef90c55
commit a967ef9dce
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/mdi.cpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: mdi.cpp // Name: src/msw/mdi.cpp
// Purpose: MDI classes // Purpose: MDI classes for wxMSW
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 04/01/98 // Created: 04/01/98
@@ -304,7 +304,7 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
} }
} }
void wxMDIParentFrame::OnSize(wxSizeEvent& event) void wxMDIParentFrame::OnSize(wxSizeEvent&)
{ {
if ( GetClientWindow() ) if ( GetClientWindow() )
{ {
@@ -1260,6 +1260,7 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
wxWindow *parent = win->GetParent(); wxWindow *parent = win->GetParent();
wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") ); wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") );
::SendMessage(GetWinHwnd(win), WM_MDIREFRESHMENU, 0, 0L);
::DrawMenuBar(GetWinHwnd(parent)); ::DrawMenuBar(GetWinHwnd(parent));
} }
@@ -1306,7 +1307,6 @@ static void RemoveWindowMenu(wxWindow *win, WXHMENU menu)
// Try to insert Window menu in front of Help, otherwise append it. // Try to insert Window menu in front of Help, otherwise append it.
HMENU hmenu = (HMENU)menu; HMENU hmenu = (HMENU)menu;
int N = GetMenuItemCount(hmenu); int N = GetMenuItemCount(hmenu);
bool success = FALSE;
for ( int i = 0; i < N; i++ ) for ( int i = 0; i < N; i++ )
{ {
wxChar buf[256]; wxChar buf[256];
@@ -1320,7 +1320,6 @@ static void RemoveWindowMenu(wxWindow *win, WXHMENU menu)
if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Window")) ) if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Window")) )
{ {
success = TRUE;
::RemoveMenu(hmenu, i, MF_BYPOSITION); ::RemoveMenu(hmenu, i, MF_BYPOSITION);
break; break;
} }