X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79f9ea0541e410d65899631db630e955af3b6a84..3175fc12b4b386754be7b9c1db13fcbc435e67da:/include/wx/msw/mdi.h diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 857f9bed3c..eb85ec402c 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); @@ -109,6 +108,9 @@ public: #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); }; // --------------------------------------------------------------------------- @@ -210,6 +212,7 @@ public: protected: virtual void DoGetScreenPosition(int *x, int *y) const; virtual void DoGetPosition(int *x, int *y) const; + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); virtual void DoSetClientSize(int width, int height); virtual void InternalSetMenuBar(); virtual bool IsMDIChild() const { return true; }