Avoid conflict between new transparency API and old background support.

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

diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index fc3fa7731ef429b839095052230075ac80b669cf..578ec3ade3a36eb126b735c9ce8ac1b74a3d1971 100644 (file)
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -18,6 +18,7 @@
 
 #include "wx/bookctrl.h"
 #include "wx/treectrl.h"        // for wxArrayTreeItemIds
 
 #include "wx/bookctrl.h"
 #include "wx/treectrl.h"        // for wxArrayTreeItemIds

+#include "wx/containr.h"

 
 typedef wxWindow wxTreebookPage;
 
 
 typedef wxWindow wxTreebookPage;
 


@@ -77,11 +78,11 @@ public:
                             int imageId = wxNOT_FOUND);
 
     // Inserts a new sub-page to the end of children of the page at given pos.
                             int imageId = wxNOT_FOUND);
 
     // Inserts a new sub-page to the end of children of the page at given pos.

-    virtual bool AddSubPage(size_t pos,
-                            wxWindow *page,
-                            const wxString& text,
-                            bool bSelect = false,
-                            int imageId = wxNOT_FOUND);
+    virtual bool InsertSubPage(size_t pos,
+                               wxWindow *page,
+                               const wxString& text,
+                               bool bSelect = false,
+                               int imageId = wxNOT_FOUND);

 
     // Adds a new page at top level after all other pages.
     virtual bool AddPage(wxWindow *page,
 
     // Adds a new page at top level after all other pages.
     virtual bool AddPage(wxWindow *page,


@@ -138,9 +139,15 @@ public:
     virtual bool DeleteAllPages();
 
 protected:
     virtual bool DeleteAllPages();
 
 protected:

+    // Implementation of a page removal. See DeletPage for comments.
+    wxTreebookPage *DoRemovePage(size_t pos);
+

     // This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages)
     virtual bool AllowNullPage() const { return true; }
 
     // This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages)
     virtual bool AllowNullPage() const { return true; }
 

+    // return the page corresponding to the tab at the specified position
+    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
+

     // event handlers
     void OnTreeSelectionChange(wxTreeEvent& event);
     void OnTreeNodeExpandedCollapsed(wxTreeEvent& event);
     // event handlers
     void OnTreeSelectionChange(wxTreeEvent& event);
     void OnTreeNodeExpandedCollapsed(wxTreeEvent& event);


@@ -180,9 +187,6 @@ private:
                          bool bSelect = false,
                          int imageId = wxNOT_FOUND);
 
                          bool bSelect = false,
                          int imageId = wxNOT_FOUND);
 

-    // Implementation of a page removal. See DeletPage for comments.
-    wxTreebookPage *DoRemovePage(size_t pos);
-

     // Sets selection in the tree control and updates the page being shown.
     int DoSetSelection(size_t pos);
 
     // Sets selection in the tree control and updates the page being shown.
     int DoSetSelection(size_t pos);
 


@@ -224,6 +228,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook)

+    WX_DECLARE_CONTROL_CONTAINER();

 };
 
 
 };