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

override TryValidator() in wxMDIParentFrame to implement forwarding of menu/toolbar events to the active child at wx level instead of forwarding the WM_COMMAND itself: this is better as it prevents the same event from being passed twice to wxApp fall back if a handler exists in the child frame but skips the event and also because the code is portable now and can be moved down to the base class; also call the base class TryValidator() from wxDocMDI classes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-26 15:24:03 +00:00
parent 22cb31398e
commit cd60273b3d
3 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/msw/mdi.cpp
View File

@@ -540,25 +540,6 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message,
}
break;
case WM_COMMAND:
{
WXWORD id, cmd;
WXHWND hwnd;
UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
(void)HandleCommand(id, cmd, hwnd);
// even if the frame didn't process it, there is no need to try it
// once again (i.e. call wxFrame::HandleCommand()) - we just did it,
// so pretend we processed the message anyhow
processed = true;
}
// always pass this message DefFrameProc(), otherwise MDI menu
// commands (and sys commands - more surprisingly!) won't work
MSWDefWindowProc(message, wParam, lParam);
break;
case WM_CREATE:
m_clientWindow = OnCreateClient();
// Uses own style for client style
@@ -688,13 +669,18 @@ void wxMDIParentFrame::OnMDICommand(wxCommandEvent& event)
#endif // wxUSE_MENUS
bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
bool wxMDIParentFrame::TryValidator(wxEvent& event)
{
wxMDIChildFrame * const child = GetActiveChild();
if ( child && child->HandleCommand(id, cmd, hwnd) )
return true;
// menu (and toolbar) events should be sent to the active child frame
// first, if any
if ( event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED )
{
wxMDIChildFrame * const child = GetActiveChild();
if ( child && child->ProcessEventHere(event) )
return true;
}
return wxFrame::HandleCommand(id, cmd, hwnd);
return wxMDIParentFrameBase::TryValidator(event);
}
WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message,