made wx[Array]TreeItemId[s] more backwards compatible

[wxWidgets.git] / include / wx / generic / notebook.h

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index 3743ac84845de227a6552c4bd1efb78f3ed150b2..91cc13f7256ffee2978060985112ac06fb46f5c9 100644 (file)
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -18,10 +18,8 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#include "wx/dynarray.h"

 #include "wx/event.h"
 #include "wx/control.h"
 #include "wx/event.h"
 #include "wx/control.h"

-#include "wx/generic/tabg.h"

 
 // ----------------------------------------------------------------------------
 // types
 
 // ----------------------------------------------------------------------------
 // types


@@ -30,30 +28,12 @@
 // fwd declarations
 class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
 // fwd declarations
 class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;

+class WXDLLEXPORT wxTabView;

 
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNotebook;
-
-// This reuses wxTabView to draw the tabs.
-class WXDLLEXPORT wxNotebookTabView: public wxTabView
-{
-DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
-public:
-  wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
-  ~wxNotebookTabView(void);
-
-  // Called when a tab is activated
-  virtual void OnTabActivate(int activateId, int deactivateId);
-  // Allows vetoing
-  virtual bool OnTabPreActivate(int activateId, int deactivateId);
-
-protected:
-   wxNotebook*      m_notebook;
-};
-

 class wxNotebook : public wxNotebookBase
 {
 public:
 class wxNotebook : public wxNotebookBase
 {
 public:


@@ -133,7 +113,7 @@ public:
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);

-  void OnIdle(wxIdleEvent& event);
+  void OnInternalIdle();

   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);