refactor WM_COMMAND messages handling in MDI frames to avoid duplicating code unneces...

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

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 9c2389e9a6f482ffc59871f79a414fdeb6fce540..127cc968ba617792656e6d979943f3db88bbe225 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -15,6 +15,8 @@
 
 #include "wx/frame.h"
 
 
 #include "wx/frame.h"
 

+class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
+

 // ---------------------------------------------------------------------------
 // wxMDIParentFrame
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxMDIParentFrame
 // ---------------------------------------------------------------------------


@@ -22,7 +24,7 @@
 class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase
 {
 public:
 class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase
 {
 public:

-    wxMDIParentFrame();
+    wxMDIParentFrame() { }

     wxMDIParentFrame(wxWindow *parent,
                      wxWindowID id,
                      const wxString& title,
     wxMDIParentFrame(wxWindow *parent,
                      wxWindowID id,
                      const wxString& title,


@@ -103,6 +105,7 @@ public:
 #if wxUSE_MENUS
     // override wxFrameBase function to also look in the active child menu bar
     virtual const wxMenuItem *FindItemInMenuBar(int menuId) const;
 #if wxUSE_MENUS
     // override wxFrameBase function to also look in the active child menu bar
     virtual const wxMenuItem *FindItemInMenuBar(int menuId) const;

+    virtual wxMenuItem *MSWFindMenuBarItem(WXWORD id);

 #endif // wxUSE_MENUS
 
 protected:
 #endif // wxUSE_MENUS
 
 protected:


@@ -115,12 +118,13 @@ protected:
     // set the size of the MDI client window to match the frame size
     void UpdateClientSize();
 
     // 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:
 #if wxUSE_MENUS
 private:
 #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();
     // add/remove window menu if we have it (i.e. m_windowMenu != NULL)
     void AddWindowMenu();
     void RemoveWindowMenu();


@@ -128,6 +132,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);
     // 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)
 #endif // wxUSE_MENUS
 
     // return the number of child frames we currently have (maybe 0)


@@ -187,7 +195,6 @@ public:
     // Handlers
     bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);
     bool HandleWindowPosChanging(void *lpPos);
     // 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);
     bool HandleGetMinMaxInfo(void *mmInfo);
 
     virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);