X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9add53a47066780852fabe9c1b7611352a39fa20..d2ce649bec85c2c0764a0f786d2b1ef444321404:/include/wx/os2/notebook.h?ds=sidebyside

diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h
index 6dcd73855b..2a1b3b95a1 100644
--- a/include/wx/os2/notebook.h
+++ b/include/wx/os2/notebook.h
@@ -14,9 +14,10 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#ifndef   _DYNARRAY_H
-  #include <wx/dynarray.h>
-#endif  //_DYNARRAY_H
+
+#include "wx/dynarray.h"
+#include "wx/string.h"
+#include "wx/notebook.h"
 
 // ----------------------------------------------------------------------------
 // types
@@ -27,7 +28,6 @@ class WXDLLEXPORT wxImageList;
 class WXDLLEXPORT wxWindow;
 
 // array of notebook pages
-typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page
 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
-class WXDLLEXPORT wxNotebook : public wxControl
+class WXDLLEXPORT wxNotebook : public wxNotebookBase
 {
 public:
   // ctors