X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd60273b3d988d2674faf953f7f4372b3b6664a9..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/msw/mdi.h diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 63e42eb74b..afef0664a4 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -24,7 +24,7 @@ class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable; class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase { public: - wxMDIParentFrame() { } + wxMDIParentFrame() { Init(); } wxMDIParentFrame(wxWindow *parent, wxWindowID id, const wxString& title, @@ -33,6 +33,8 @@ public: long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxString& name = wxFrameNameStr) { + Init(); + Create(parent, id, title, pos, size, style, name); } @@ -108,9 +110,6 @@ public: #endif // wxUSE_MENUS protected: - // override to pass menu/toolbar events to the active child first - virtual bool TryValidator(wxEvent& event); - #if wxUSE_MENUS_NATIVE virtual void InternalSetMenuBar(); #endif // wxUSE_MENUS_NATIVE @@ -121,6 +120,9 @@ protected: void UpdateClientSize(); private: + // common part of all ctors + void Init(); + #if wxUSE_MENUS // "Window" menu commands event handlers void OnMDICommand(wxCommandEvent& event); @@ -212,6 +214,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; }