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

diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h
index fece36062d..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,8 +28,7 @@ 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 *, wxArrayPages);
+WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayNBPages);
 
 // ----------------------------------------------------------------------------
 // wxNotebook
@@ -37,7 +37,7 @@ WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
 // 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
@@ -151,7 +151,7 @@ protected:
   void ChangePage(int nOldSel, int nSel); // change pages
 
   wxImageList  *m_pImageList; // we can have an associated image list
-  wxArrayPages  m_aPages;     // array of pages
+  wxArrayNBPages  m_aPages;     // array of pages
 
   int m_nSelection;           // the current selection (-1 if none)