added wxString::rbegin() and rend()

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

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index d5e1af0316890947c8a28b5747b04c6f473d0c95..02ad3f6f5e385ba79c0caa5ce38c4b01d3f76fde 100644 (file)
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -119,22 +119,29 @@ public:
     virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const = 0;
 
     // get/set size of area between book control area and page area
     virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const = 0;
 
     // get/set size of area between book control area and page area

-    inline size_t GetInternalBorder() const
+    inline unsigned int GetInternalBorder() const

     {
         return m_internalBorder;
     }
     {
         return m_internalBorder;
     }

-    void SetInternalBorder(size_t internalBorder)
+    void SetInternalBorder(unsigned int internalBorder)

     {
         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
     void SetFitToCurrentPage(bool fit) { m_fitToCurrentPage = fit; }
     bool GetFitToCurrentPage() const { return m_fitToCurrentPage; }
 
     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
     // ----------
 


@@ -236,13 +243,19 @@ protected:
     // Whether to shrink to fit current page
     bool m_fitToCurrentPage;
 
     // 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
     void Init();
 
     // internal border
 private:
 
     // common part of all ctors
     void Init();
 
     // internal border

-    size_t m_internalBorder;
+    unsigned int m_internalBorder;

 
     DECLARE_ABSTRACT_CLASS(wxBookCtrlBase)
     DECLARE_NO_COPY_CLASS(wxBookCtrlBase)
 
     DECLARE_ABSTRACT_CLASS(wxBookCtrlBase)
     DECLARE_NO_COPY_CLASS(wxBookCtrlBase)