Applied Patch #1502804: wx*PickerCtrl documentation fixes

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

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index d1dfe04f5022779e39e30b428ba65b919b7eb9c8..4cea68ba31230c34f62e8833596c8277466017e6 100644 (file)
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -118,9 +118,6 @@ public:
     // calculate the size of the control from the size of its page
     virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const = 0;
 
     // calculate the size of the control from the size of its page
     virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const = 0;
 

-    // get the default alignment
-    virtual int GetDefaultAlignment() const { return wxBK_TOP; }
-

     // get/set size of area between book control area and page area
     unsigned int GetInternalBorder() const { return m_internalBorder; }
     void SetInternalBorder(unsigned int border) { m_internalBorder = border; }
     // get/set size of area between book control area and page area
     unsigned int GetInternalBorder() const { return m_internalBorder; }
     void SetInternalBorder(unsigned int border) { m_internalBorder = border; }


@@ -130,7 +127,7 @@ public:
     int GetControlMargin() const { return m_controlMargin; }
 
     // returns true if we have wxBK_TOP or wxBK_BOTTOM style
     int GetControlMargin() const { return m_controlMargin; }
 
     // returns true if we have wxBK_TOP or wxBK_BOTTOM style

-    bool IsVertical() const { return HasFlag(wxBK_ALIGN_MASK) ? HasFlag(wxBK_BOTTOM | wxBK_TOP) : (0 != (GetDefaultAlignment() & (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; }
 
     // set/get option to shrink to fit current page
     void SetFitToCurrentPage(bool fit) { m_fitToCurrentPage = fit; }