Renamed internal GetClientWindow to GetClientAreaWindow so

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index ac8e96546692eb883bad8a10b082cb2e436fb1d2..be8ba1d89f8358a18d62383c3882b48b990edbe7 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -26,8 +26,7 @@
 
 #include "wx/control.h"
 #include "wx/dynarray.h"
 
 #include "wx/control.h"
 #include "wx/dynarray.h"

-
-class WXDLLEXPORT wxImageList;
+#include "wx/imaglist.h"

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


@@ -155,7 +154,7 @@ public:
 
 protected:
     // remove the page and return a pointer to it
 
 protected:
     // remove the page and return a pointer to it

-    virtual wxNotebookPage *DoRemovePage(int page) = 0;
+    virtual wxNotebookPage *DoRemovePage(int page);

 
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();


@@ -273,8 +272,6 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
     #include  "wx/generic/notebook.h"
 #elif defined(__WXGTK__)
     #include  "wx/gtk/notebook.h"
     #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__)
 #elif defined(__WXMAC__)
     #include  "wx/mac/notebook.h"
 #elif defined(__WXPM__)