Tinderbox build fix for wxUnivGTK build.

[wxWidgets.git] / include / wx / bookctrl.h

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 171366205fdf619a478779dc17ffdb6ce2bfe32c..02ad3f6f5e385ba79c0caa5ce38c4b01d3f76fde 100644 (file)
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -128,9 +128,20 @@ public:
         m_internalBorder = internalBorder;
     }
 
         m_internalBorder = internalBorder;
     }
 

-    // returns true if we have wxCHB_TOP or wxCHB_BOTTOM style
+    // Sets/gets the margin around the controller
+    void SetControlMargin(int margin) { m_controlMargin = margin; }
+    int GetControlMargin() const { return m_controlMargin; }
+
+    // returns true if we have wxBK_TOP or wxBK_BOTTOM style

     bool IsVertical() const { return HasFlag(wxBK_BOTTOM | wxBK_TOP); }
 
     bool IsVertical() const { return HasFlag(wxBK_BOTTOM | wxBK_TOP); }
 

+    // set/get option to shrink to fit current page
+    void SetFitToCurrentPage(bool fit) { m_fitToCurrentPage = fit; }
+    bool GetFitToCurrentPage() const { return m_fitToCurrentPage; }
+
+    // returns the sizer containing the control, if any
+    wxSizer* GetControlSizer() const { return m_controlSizer; }
+

     // operations
     // ----------
 
     // operations
     // ----------
 


@@ -207,6 +218,9 @@ protected:
     // Always rely on GetBestSize, which will look at all the pages
     virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
 
     // Always rely on GetBestSize, which will look at all the pages
     virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
 

+    // Lay out controls
+    void DoSize();
+

     // the array of all pages of this control
     wxArrayPages m_pages;
 
     // the array of all pages of this control
     wxArrayPages m_pages;
 


@@ -226,6 +240,15 @@ protected:
     // controller buddy if available, NULL otherwise (usually for native book controls like wxNotebook)
     wxControl *m_bookctrl;
 
     // controller buddy if available, NULL otherwise (usually for native book controls like wxNotebook)
     wxControl *m_bookctrl;
 

+    // Whether to shrink to fit current page
+    bool m_fitToCurrentPage;
+
+    // the sizer containing the choice control
+    wxSizer*    m_controlSizer;
+
+    // the margin around the choice control
+    int         m_controlMargin;
+

 private:
 
     // common part of all ctors
 private:
 
     // common part of all ctors