compilation fixes (I wonder how did you people ever compile it...)

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

diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h
index 6dcd73855b9be7f5dacbebeaef69f3f8c2738034..2a1b3b95a1017372292f4bf40b5980cd2238050a 100644 (file)
--- a/include/wx/os2/notebook.h
+++ b/include/wx/os2/notebook.h
@@ -14,9 +14,10 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#ifndef   _DYNARRAY_H
-  #include <wx/dynarray.h>
-#endif  //_DYNARRAY_H
+
+#include "wx/dynarray.h"
+#include "wx/string.h"
+#include "wx/notebook.h"

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


@@ -27,7 +28,6 @@ class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
 
 // array of notebook pages
 class WXDLLEXPORT wxWindow;
 
 // array of notebook pages

-typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page

 WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayNBPages);
 
 // ----------------------------------------------------------------------------
 WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayNBPages);
 
 // ----------------------------------------------------------------------------


@@ -37,7 +37,7 @@ WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayNBPages);
 // FIXME this class should really derive from wxTabCtrl, but the interface is not
 //       exactly the same, so I can't do it right now and instead we reimplement
 //       part of wxTabCtrl here
 // FIXME this class should really derive from wxTabCtrl, but the interface is not
 //       exactly the same, so I can't do it right now and instead we reimplement
 //       part of wxTabCtrl here

-class WXDLLEXPORT wxNotebook : public wxControl
+class WXDLLEXPORT wxNotebook : public wxNotebookBase

 {
 public:
   // ctors
 {
 public:
   // ctors