(blindly) fixed header case confusion (replacement for patch 763760)

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

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index e322e9430974289500e0cf9df87edd8d07c57031..91cc13f7256ffee2978060985112ac06fb46f5c9 100644 (file)
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -18,10 +18,8 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#include "wx/dynarray.h"
 #include "wx/event.h"
 #include "wx/control.h"
-#include "wx/generic/tabg.h"
 
 // ----------------------------------------------------------------------------
 // types
@@ -30,37 +28,12 @@
 // fwd declarations
 class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
-
-// Already defined in wx/notebook.h
-#if 0
-// array of notebook pages
-typedef wxWindow wxNotebookPage;  // so far, any window can be a page
-WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
-#endif
+class WXDLLEXPORT wxTabView;
 
 // ----------------------------------------------------------------------------
 // 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:
@@ -140,7 +113,7 @@ public:
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
-  void OnIdle(wxIdleEvent& event);
+  void OnInternalIdle();
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
@@ -173,11 +146,6 @@ protected:
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
 
-#if 0
-  wxImageList  *m_pImageList; // we can have an associated image list
-  wxArrayPages  m_aPages;     // array of pages
-#endif
-  
   int m_nSelection;           // the current selection (-1 if none)
 
   wxTabView*   m_tabView;