Allow building in unicode mode with just "make -f makefile.g95 UNICODE=1"

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 0a05ec91203e4cf2dac383f7d6df50c6d5d76806..a7583c58571a00d4a0384e67941f5f8e8d3472c1 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
@@ -273,8 +272,6 @@ 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(__WXPM__)