Win16 cursor/icon functions are not needed any longer

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 0a05ec91203e4cf2dac383f7d6df50c6d5d76806..eb2b8af14ea5cf287f7264624a99df67041da048 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -12,7 +12,7 @@
 #ifndef _WX_NOTEBOOK_H_BASE_
 #define _WX_NOTEBOOK_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "notebookbase.h"
 #endif
 
@@ -26,8 +26,7 @@
 
 #include "wx/control.h"
 #include "wx/dynarray.h"
-
-class WXDLLEXPORT wxImageList;
+#include "wx/imaglist.h"
 
 // ----------------------------------------------------------------------------
 // types
@@ -166,6 +165,8 @@ protected:
     wxArrayPages  m_pages;      // array of pages
     wxImageList  *m_imageList;  // we can have an associated image list
     bool m_ownsImageList;       // true if we must delete m_imageList
+
+    DECLARE_NO_COPY_CLASS(wxNotebookBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -273,14 +274,12 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
     #include  "wx/generic/notebook.h"
 #elif defined(__WXGTK__)
     #include  "wx/gtk/notebook.h"
-#elif defined(__WXQT__)
-    #include  "wx/qt/notebook.h"
 #elif defined(__WXMAC__)
     #include  "wx/mac/notebook.h"
+#elif defined(__WXCOCOA__)
+    #include  "wx/generic/notebook.h"
 #elif defined(__WXPM__)
     #include  "wx/os2/notebook.h"
-#elif defined(__WXSTUBS__)
-    #include  "wx/stubs/notebook.h"
 #endif
 
 #endif // wxUSE_NOTEBOOK