remove unused/unneeded menuitem cruft

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

diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index c05e56e1aa35f34b353c150ab69d6a8786d2a6ee..bd60e6dca1942c1941e8ad9e9fc08604c58c0b20 100644 (file)
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -18,17 +18,16 @@
 
 #include "wx/bookctrl.h"
 #include "wx/treectrl.h"        // for wxArrayTreeItemIds
-#include "wx/containr.h"
 
 typedef wxWindow wxTreebookPage;
 
-class WXDLLEXPORT wxTreeEvent;
+class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
 
 // ----------------------------------------------------------------------------
 // wxTreebook
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTreebook : public wxBookCtrlBase
+class WXDLLIMPEXP_CORE wxTreebook : public wxBookCtrlBase
 {
 public:
     // Constructors and such
@@ -222,12 +221,11 @@ private:
 
     // Returns internal number of pages which can be different from
     // GetPageCount() while performing a page insertion or removal.
-    size_t DoInternalGetPageCount() const { return m_treeIds.Count(); }
+    size_t DoInternalGetPageCount() const { return m_treeIds.GetCount(); }
 
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook)
-    WX_DECLARE_CONTROL_CONTAINER();
 };
 
 
@@ -235,7 +233,7 @@ private:
 // treebook event class and related stuff
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTreebookEvent : public wxBookCtrlBaseEvent
+class WXDLLIMPEXP_CORE wxTreebookEvent : public wxBookCtrlBaseEvent
 {
 public:
     wxTreebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,