X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79f9ea0541e410d65899631db630e955af3b6a84..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/msw/mdi.h?ds=sidebyside

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 857f9bed3c..a699a3125c 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes
 // Created:     01/02/97
-// RCS-ID:      $Id$
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -24,7 +23,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 +32,8 @@ public:
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxFrameNameStr)
     {
+        Init();
+
         Create(parent, id, title, pos, size, style, name);
     }
 
@@ -94,7 +95,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);
@@ -119,6 +119,9 @@ protected:
     void UpdateClientSize();
 
 private:
+    // common part of all ctors
+    void Init();
+
 #if wxUSE_MENUS
     // "Window" menu commands event handlers
     void OnMDICommand(wxCommandEvent& event);
@@ -146,7 +149,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
+    wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
 };
 
 // ---------------------------------------------------------------------------
@@ -210,6 +213,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; }