Small speed up to fonts and support for scaling.

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

diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index 53582ba352c9f344055a6903be6900195091d07a..3743ac84845de227a6552c4bd1efb78f3ed150b2 100644 (file)
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -11,7 +11,7 @@
 #ifndef _WX_NOTEBOOK_H_
 #define _WX_NOTEBOOK_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "notebook.h"
 #endif
 
@@ -31,13 +31,6 @@
 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
-
 // ----------------------------------------------------------------------------
 // wxNotebook
 // ----------------------------------------------------------------------------
@@ -54,6 +47,8 @@ public:
 
   // 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;
@@ -171,11 +166,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;