Disable double-to-float conversion tests in wxAny code.

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

diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index 86aa0acabcbb58f2b338bbb37ba1ed1746351a69..a22a72a2b0471442194f68131aaacb63602f6d90 100644 (file)
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -17,6 +17,7 @@
 #if wxUSE_TREEBOOK
 
 #include "wx/bookctrl.h"
 #if wxUSE_TREEBOOK
 
 #include "wx/bookctrl.h"

+#include "wx/containr.h"

 #include "wx/treectrl.h"        // for wxArrayTreeItemIds
 
 typedef wxWindow wxTreebookPage;
 #include "wx/treectrl.h"        // for wxArrayTreeItemIds
 
 typedef wxWindow wxTreebookPage;


@@ -27,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
 // wxTreebook
 // ----------------------------------------------------------------------------
 
 // wxTreebook
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxTreebook : public wxBookCtrlBase
+class WXDLLIMPEXP_CORE wxTreebook : public wxNavigationEnabled<wxBookCtrlBase>

 {
 public:
     // Constructors and such
 {
 public:
     // Constructors and such


@@ -74,27 +75,27 @@ public:
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,

-                            int imageId = wxNOT_FOUND);
+                            int imageId = NO_IMAGE);

 
     // Inserts a new sub-page to the end of children of the page at given pos.
     virtual bool InsertSubPage(size_t pos,
                                wxWindow *page,
                                const wxString& text,
                                bool bSelect = false,
 
     // Inserts a new sub-page to the end of children of the page at given pos.
     virtual bool InsertSubPage(size_t pos,
                                wxWindow *page,
                                const wxString& text,
                                bool bSelect = false,

-                               int imageId = wxNOT_FOUND);
+                               int imageId = NO_IMAGE);

 
     // Adds a new page at top level after all other pages.
     virtual bool AddPage(wxWindow *page,
                          const wxString& text,
                          bool bSelect = false,
 
     // Adds a new page at top level after all other pages.
     virtual bool AddPage(wxWindow *page,
                          const wxString& text,
                          bool bSelect = false,

-                         int imageId = wxNOT_FOUND);
+                         int imageId = NO_IMAGE);

 
     // Adds a new child-page to the last top-level page inserted.
     // Useful when constructing 1 level tree structure.
     virtual bool AddSubPage(wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
 
     // Adds a new child-page to the last top-level page inserted.
     // Useful when constructing 1 level tree structure.
     virtual bool AddSubPage(wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,

-                            int imageId = wxNOT_FOUND);
+                            int imageId = NO_IMAGE);

 
     // Deletes the page and ALL its children. Could trigger page selection
     // change in a case when selected page is removed. In that case its parent
 
     // Deletes the page and ALL its children. Could trigger page selection
     // change in a case when selected page is removed. In that case its parent


@@ -169,16 +170,16 @@ private:
                       wxWindow *page,
                       const wxString& text,
                       bool bSelect = false,
                       wxWindow *page,
                       const wxString& text,
                       bool bSelect = false,

-                      int imageId = wxNOT_FOUND);
+                      int imageId = NO_IMAGE);

     bool DoInsertSubPage(size_t pos,
                          wxWindow *page,
                          const wxString& text,
                          bool bSelect = false,
     bool DoInsertSubPage(size_t pos,
                          wxWindow *page,
                          const wxString& text,
                          bool bSelect = false,

-                         int imageId = wxNOT_FOUND);
+                         int imageId = NO_IMAGE);

     bool DoAddSubPage(wxWindow *page,
                          const wxString& text,
                          bool bSelect = false,
     bool DoAddSubPage(wxWindow *page,
                          const wxString& text,
                          bool bSelect = false,

-                         int imageId = wxNOT_FOUND);
+                         int imageId = NO_IMAGE);

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


@@ -229,27 +230,33 @@ private:
 // ----------------------------------------------------------------------------
 
 // wxTreebookEvent is obsolete and defined for compatibility only
 // ----------------------------------------------------------------------------
 
 // wxTreebookEvent is obsolete and defined for compatibility only

-typedef wxBookCtrlEvent wxTreebookEvent;
+#define wxTreebookEvent wxBookCtrlEvent

 typedef wxBookCtrlEventFunction wxTreebookEventFunction;
 #define wxTreebookEventHandler(func) wxBookCtrlEventHandler(func)
 
 
 typedef wxBookCtrlEventFunction wxTreebookEventFunction;
 #define wxTreebookEventHandler(func) wxBookCtrlEventHandler(func)
 
 

-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TREEBOOK_NODE_EXPANDED, wxBookCtrlEvent );

 
 #define EVT_TREEBOOK_PAGE_CHANGED(winid, fn) \
 
 #define EVT_TREEBOOK_PAGE_CHANGED(winid, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))

 
 #define EVT_TREEBOOK_PAGE_CHANGING(winid, fn) \
 
 #define EVT_TREEBOOK_PAGE_CHANGING(winid, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))

 
 #define EVT_TREEBOOK_NODE_COLLAPSED(winid, fn) \
 
 #define EVT_TREEBOOK_NODE_COLLAPSED(winid, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREEBOOK_NODE_COLLAPSED, winid, wxBookCtrlEventHandler(fn))

 
 #define EVT_TREEBOOK_NODE_EXPANDED(winid, fn) \
 
 #define EVT_TREEBOOK_NODE_EXPANDED(winid, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREEBOOK_NODE_EXPANDED, winid, wxBookCtrlEventHandler(fn))
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED     wxEVT_TREEBOOK_PAGE_CHANGED
+#define wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING    wxEVT_TREEBOOK_PAGE_CHANGING
+#define wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED   wxEVT_TREEBOOK_NODE_COLLAPSED
+#define wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED    wxEVT_TREEBOOK_NODE_EXPANDED

 
 
 #endif // wxUSE_TREEBOOK
 
 
 #endif // wxUSE_TREEBOOK