X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e6d684052a7a0b66c4d6c299bcade4c5ae14193..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/mdi.h

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 9c2389e9a6..caf235fd56 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -15,6 +15,8 @@
 
 #include "wx/frame.h"
 
+class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
+
 // ---------------------------------------------------------------------------
 // wxMDIParentFrame
 // ---------------------------------------------------------------------------
@@ -22,7 +24,7 @@
 class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase
 {
 public:
-    wxMDIParentFrame();
+    wxMDIParentFrame() { Init(); }
     wxMDIParentFrame(wxWindow *parent,
                      wxWindowID id,
                      const wxString& title,
@@ -31,6 +33,8 @@ public:
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxFrameNameStr)
     {
+        Init();
+
         Create(parent, id, title, pos, size, style, name);
     }
 
@@ -92,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);
@@ -102,10 +105,14 @@ public:
 
 #if wxUSE_MENUS
     // override wxFrameBase function to also look in the active child menu bar
-    virtual const wxMenuItem *FindItemInMenuBar(int menuId) const;
+    // 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
@@ -115,12 +122,16 @@ protected:
     // set the size of the MDI client window to match the frame size
     void UpdateClientSize();
 
-
-    // true if MDI Frame is intercepting commands, not child
-    bool m_parentFrameActive;
-
 private:
+    // common part of all ctors
+    void Init();
+
 #if wxUSE_MENUS
+    // "Window" menu commands event handlers
+    void OnMDICommand(wxCommandEvent& event);
+    void OnMDIChild(wxCommandEvent& event);
+
+
     // add/remove window menu if we have it (i.e. m_windowMenu != NULL)
     void AddWindowMenu();
     void RemoveWindowMenu();
@@ -128,6 +139,10 @@ private:
     // update the window menu (if we have it) to enable or disable the commands
     // which only make sense when we have more than one child
     void UpdateWindowMenu(bool enable);
+
+#if wxUSE_ACCEL
+    wxAcceleratorTable *m_accelWindowMenu;
+#endif // wxUSE_ACCEL
 #endif // wxUSE_MENUS
 
     // return the number of child frames we currently have (maybe 0)
@@ -138,7 +153,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
+    wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
 };
 
 // ---------------------------------------------------------------------------
@@ -187,7 +202,6 @@ public:
     // Handlers
     bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);
     bool HandleWindowPosChanging(void *lpPos);
-    bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleGetMinMaxInfo(void *mmInfo);
 
     virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
@@ -203,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; }