fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index ea8784a5db03c4758882ff04cc211a83ede184f4..02ad3f6f5e385ba79c0caa5ce38c4b01d3f76fde 100644 (file)
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -128,12 +128,19 @@ 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); }
 
     // set/get option to shrink to fit current page
     bool IsVertical() const { return HasFlag(wxBK_BOTTOM | wxBK_TOP); }
 
     // set/get option to shrink to fit current page

-    void SetShrinkMode(bool shrink) { m_shrinkToFit = shrink; }
-    bool GetShrinkMode() const { return m_shrinkToFit; }
+    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
     // ----------


@@ -234,7 +241,13 @@ protected:
     wxControl *m_bookctrl;
 
     // Whether to shrink to fit current page
     wxControl *m_bookctrl;
 
     // Whether to shrink to fit current page

-    bool m_shrinkToFit;
+    bool m_fitToCurrentPage;
+
+    // the sizer containing the choice control
+    wxSizer*    m_controlSizer;
+
+    // the margin around the choice control
+    int         m_controlMargin;

 
 private:
 
 
 private: