tentative fix for BestSize problems (non-native toolbar)

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

diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h
index 863ff82e8622d208c93ab1dc56f89b14cfd84c10..927194c27d7bf657dbb94f2cd99509531631d744 100644 (file)
--- a/include/wx/mac/carbon/mdi.h
+++ b/include/wx/mac/carbon/mdi.h
@@ -32,15 +32,16 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 
 public:
 
-  wxMDIParentFrame();
-  inline wxMDIParentFrame(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,  // Scrolling refers to client window
-           const wxString& name = wxFrameNameStr)
+  wxMDIParentFrame() { Init(); }
+  wxMDIParentFrame(wxWindow *parent,
+                   wxWindowID id,
+                   const wxString& title,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,  // Scrolling refers to client window
+                   const wxString& name = wxFrameNameStr)
   {
+      Init();
       Create(parent, id, title, pos, size, style, name);
   }
 
@@ -84,19 +85,34 @@ public:
 
   virtual bool Show( bool show = true );
 
+  // overridden base clas virtuals
+  virtual void AddChild(wxWindowBase *child);
+  virtual void RemoveChild(wxWindowBase *child);
+
 protected:
+    // common part of all ctors
+    void Init();
+
+    // returns true if this frame has some contents and so should be visible,
+    // false if it's used solely as container for its children
+    bool ShouldBeVisible() const;
 
-  // TODO maybe have this member
-  wxMDIClientWindow     *m_clientWindow;
-  wxMDIChildFrame *               m_currentChild;
-    wxMenu*                         m_windowMenu;
 
-    // TRUE if MDI Frame is intercepting commands, not child
+    // 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;
 
+    // true if the frame should be shown but is not because it is empty and
+    // useless otherwise than a container for its children
+    bool m_shouldBeShown;
+
 private:
     friend class WXDLLEXPORT wxMDIChildFrame;
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 class WXDLLEXPORT wxMDIChildFrame: public wxFrame