define __WXFUNCTION__ instead of redefining the (semi-)standard __FUNCTION__ which...

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

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index ea8784a5db03c4758882ff04cc211a83ede184f4..d5e1af0316890947c8a28b5747b04c6f473d0c95 100644 (file)
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -119,11 +119,11 @@ public:
     virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const = 0;
 
     // get/set size of area between book control area and page area
-    inline unsigned int GetInternalBorder() const
+    inline size_t GetInternalBorder() const
     {
         return m_internalBorder;
     }
-    void SetInternalBorder(unsigned int internalBorder)
+    void SetInternalBorder(size_t internalBorder)
     {
         m_internalBorder = internalBorder;
     }
@@ -132,8 +132,8 @@ public:
     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; }
 
     // operations
     // ----------
@@ -234,7 +234,7 @@ protected:
     wxControl *m_bookctrl;
 
     // Whether to shrink to fit current page
-    bool m_shrinkToFit;
+    bool m_fitToCurrentPage;
 
 private:
 
@@ -242,7 +242,7 @@ private:
     void Init();
 
     // internal border
-    unsigned int m_internalBorder;
+    size_t m_internalBorder;
 
     DECLARE_ABSTRACT_CLASS(wxBookCtrlBase)
     DECLARE_NO_COPY_CLASS(wxBookCtrlBase)