Window management and sizer layout corrections

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

diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h
index 39415272d8558a7ede9d03cac0263fd8e51dd2bd..2a1b3b95a1017372292f4bf40b5980cd2238050a 100644 (file)
--- a/include/wx/os2/notebook.h
+++ b/include/wx/os2/notebook.h
@@ -17,7 +17,7 @@
 
 #include "wx/dynarray.h"
 #include "wx/string.h"
 
 #include "wx/dynarray.h"
 #include "wx/string.h"

-#include "wx/control.h"
+#include "wx/notebook.h"

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


@@ -28,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);
 
 // ----------------------------------------------------------------------------


@@ -38,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