Unified flags for orienting wxBookCtrls (with backward compatibility). Centralised code for sizing internals.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/treebook.h

@@ -23,24 +23,6 @@ typedef wxWindow wxTreebookPage;
 
 class WXDLLEXPORT wxTreeEvent;
 
-// ----------------------------------------------------------------------------
-// style flags
-// ----------------------------------------------------------------------------
-
-// This is a set of synonyms of wxNB_XXX, which still could be used directly
-// for styling the control. Defined for consistency with wxListbook and
-// wxChoicebook only.
-#define wxTBK_LEFT      wxNB_LEFT
-#define wxTBK_RIGHT     wxNB_RIGHT
-
-// we don't support TOP/BOTTOM orientations but still define the flags (again,
-// for consistency with others)
-#define wxTBK_TOP       wxTBK_LEFT
-#define wxTBK_BOTTOM    wxTBK_RIGHT
-
-#define wxTBK_ALIGN_MASK (wxTBK_LEFT | wxTBK_RIGHT)
-#define wxTBK_DEFAULT   wxTBK_LEFT
-
 // ----------------------------------------------------------------------------
 // wxTreebook
 // ----------------------------------------------------------------------------
@@ -62,7 +44,7 @@ public:
                wxWindowID id,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
-               long style = wxTBK_DEFAULT,
+               long style = wxBK_DEFAULT,
                const wxString& name = wxEmptyString)
     {
         Init();
@@ -75,7 +57,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxTBK_DEFAULT,
+                long style = wxBK_DEFAULT,
                 const wxString& name = wxEmptyString);
 
 
@@ -137,6 +119,9 @@ public:
     // get the parent page or wxNOT_FOUND if this is a top level page
     int GetPageParent(size_t pos) const;
 
+    // the tree control we use for showing the pages index tree
+    wxTreeCtrl* GetTreeCtrl() const { return (wxTreeCtrl*)m_bookctrl; }
+
 
     // Standard operations inherited from wxBookCtrlBase
     // -------------------------------------------------
@@ -156,21 +141,10 @@ protected:
     // This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages)
     virtual bool AllowNullPage() const { return true; }
 
-    // get the size which the tree control should have
-    wxSize GetTreeSize() const;
-
-    // get the page area
-    wxRect GetPageRect() const;
-
     // event handlers
-    void OnSize(wxSizeEvent& event);
     void OnTreeSelectionChange(wxTreeEvent& event);
     void OnTreeNodeExpandedCollapsed(wxTreeEvent& event);
 
-
-    // the tree control we use for showing the pages index tree
-    wxTreeCtrl *m_tree;
-
     // array of page ids and page windows
     wxArrayTreeItemIds m_treeIds;