Fix wrong return value in the changes of r73365.

[wxWidgets.git] / include / wx / msw / mdi.h

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 857f9bed3cd5223c5612a179b22d4285ed6d0c16..caf235fd56a68ec7578df102d48bf70b0cdef00d 100644 (file)
--- 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);
     }
 
@@ -94,7 +96,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 +110,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
@@ -119,6 +123,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 +153,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
+    wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
 };
 
 // ---------------------------------------------------------------------------
@@ -210,6 +217,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; }