X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fd2ecfed35280a776ebef0a45ef6eb868e9bd68..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/msw/mdi.cpp diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index ad76a20f54..6dbb49ea1a 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -369,8 +369,7 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu) } #if wxUSE_ACCEL - delete m_accelWindowMenu; - m_accelWindowMenu = NULL; + wxDELETE(m_accelWindowMenu); if ( menu && menu->HasAccels() ) m_accelWindowMenu = menu->CreateAccelTable(); @@ -574,19 +573,6 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message, processed = true; break; - - case WM_ERASEBKGND: - processed = true; - - // we erase background ourselves - rc = true; - break; - - case WM_SIZE: - // though we don't (usually) resize the MDI client to exactly fit - // the client area we need to pass this one to DefFrameProc to - // allow the children to show - break; } if ( !processed ) @@ -699,7 +685,7 @@ bool wxMDIParentFrame::TryBefore(wxEvent& event) if ( event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED ) { wxMDIChildFrame * const child = GetActiveChild(); - if ( child && child->ProcessEventHere(event) ) + if ( child && child->ProcessWindowEventLocally(event) ) return true; } @@ -1125,7 +1111,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate), WXHMENU hMenuParent = parent->m_hMenu; - // activate the the parent menu only when there is no other child + // activate the parent menu only when there is no other child // that has been activated if ( hMenuParent && !hwndAct ) hMenuToSet = hMenuParent;