As in 2.2.9, toolbars should not get the focus.

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

diff --git a/include/wx/mac/mdi.h b/include/wx/mac/mdi.h
index fc3cf946034e707beace39fe5a71887b8ec1db3e..091021d0fc7459f143ddc5c0d841c4c5e7830805 100644 (file)
--- a/include/wx/mac/mdi.h
+++ b/include/wx/mac/mdi.h
@@ -28,9 +28,8 @@ class WXDLLEXPORT wxMDIChildFrame;
 
 class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 {
-DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+  DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 
-  friend class WXDLLEXPORT wxMDIChildFrame;
 public:
 
   wxMDIParentFrame();
@@ -64,7 +63,7 @@ public:
   // Gets the size available for subwindows after menu size, toolbar size
   // and status bar size have been subtracted. If you want to manage your own
   // toolbar(s), don't call SetToolBar.
-  void GetClientSize(int *width, int *height) const;
+  void DoGetClientSize(int *width, int *height) const;
 
   // Get the active MDI child window (Windows only)
   wxMDIChildFrame *GetActiveChild() const ;
@@ -87,7 +86,14 @@ protected:
 
   // TODO maybe have this member
   wxMDIClientWindow     *m_clientWindow;
+  wxMDIChildFrame *               m_currentChild;
+    wxMenu*                         m_windowMenu;
 
+    // TRUE if MDI Frame is intercepting commands, not child
+    bool m_parentFrameActive;
+
+private:
+    friend class WXDLLEXPORT wxMDIChildFrame;
 DECLARE_EVENT_TABLE()
 };
 
@@ -105,6 +111,7 @@ public:
            long style = wxDEFAULT_FRAME_STYLE,
            const wxString& name = wxFrameNameStr)
   {
+      Init() ;
       Create(parent, id, title, pos, size, style, name);
   }
 
@@ -120,14 +127,16 @@ public:
 
   // Set menu bar
   void SetMenuBar(wxMenuBar *menu_bar);
-  void SetClientSize(int width, int height);
-  void GetPosition(int *x, int *y) const ;
 
   // MDI operations
   virtual void Maximize();
   virtual void Maximize( bool ){ Maximize() ; } // this one is inherited from wxFrame
   virtual void Restore();
   virtual void Activate();
+protected:
+
+    // common part of all ctors
+    void Init();
 };
 
 /* The client window is a child of the parent MDI frame, and itself