X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05fd6a8b82c83c011983591702bd7d52559fc1a3..3f26ef31422b9d1496d9f19d53a489f6f04a1090:/include/wx/bookctrl.h

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index d5e1af0316..4cea68ba31 100644
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -119,22 +119,23 @@ public:
     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
-    {
-        return m_internalBorder;
-    }
-    void SetInternalBorder(size_t internalBorder)
-    {
-        m_internalBorder = internalBorder;
-    }
+    unsigned int GetInternalBorder() const { return m_internalBorder; }
+    void SetInternalBorder(unsigned int border) { m_internalBorder = border; }
 
-    // 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; }
 
+    // returns the sizer containing the control, if any
+    wxSizer* GetControlSizer() const { return m_controlSizer; }
+
     // operations
     // ----------
 
@@ -191,6 +192,13 @@ public:
         }
     }
 
+    // hit test: returns which page is hit and, optionally, where (icon, label)
+    virtual int HitTest(const wxPoint& WXUNUSED(pt),
+                        long * WXUNUSED(flags) = NULL) const
+    {
+        return wxNOT_FOUND;
+    }
+
 protected:
     // Should we accept NULL page pointers in Add/InsertPage()?
     //
@@ -214,6 +222,12 @@ protected:
     // Lay out controls
     void DoSize();
 
+#if wxUSE_HELP
+    // Show the help for the corresponding page
+    void OnHelp(wxHelpEvent& event);
+#endif // wxUSE_HELP
+
+
     // the array of all pages of this control
     wxArrayPages m_pages;
 
@@ -236,13 +250,19 @@ protected:
     // 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
-    size_t m_internalBorder;
+    unsigned int m_internalBorder;
 
     DECLARE_ABSTRACT_CLASS(wxBookCtrlBase)
     DECLARE_NO_COPY_CLASS(wxBookCtrlBase)