X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1483e5db8d719803c2d04984fd5ad85176964e16..2fd716136a961ab6038996343e42257c2d81aac2:/include/wx/msw/mdi.h?ds=sidebyside diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 127cc968ba..0d4e4be6a5 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -94,7 +94,6 @@ public: void OnIconized(wxIconizeEvent& event); bool HandleActivate(int state, bool minimized, WXHWND activate); - bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); // override window proc for MDI-specific message processing virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); @@ -104,11 +103,14 @@ public: #if wxUSE_MENUS // override wxFrameBase function to also look in the active child menu bar - virtual const wxMenuItem *FindItemInMenuBar(int menuId) const; - virtual wxMenuItem *MSWFindMenuBarItem(WXWORD id); + // and the "Window" menu + virtual wxMenuItem *FindItemInMenuBar(int menuId) const; #endif // wxUSE_MENUS protected: + // override to pass menu/toolbar events to the active child first + virtual bool TryBefore(wxEvent& event); + #if wxUSE_MENUS_NATIVE virtual void InternalSetMenuBar(); #endif // wxUSE_MENUS_NATIVE @@ -146,7 +148,7 @@ private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) - DECLARE_NO_COPY_CLASS(wxMDIParentFrame) + wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame); }; // ---------------------------------------------------------------------------