Committing in .

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

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 8b94e5ce8fb0efc2c3ce6e242c973749bb72c835..4b95a47eb7c3b2b6c2bcbd5dd50057a182f8c3f8 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -19,9 +19,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

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


@@ -32,7 +31,8 @@ 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
+//typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page
+typedef wxWindow wxNotebookPage;  // so far, any window can be a page

 
 WX_DEFINE_EXPORTED_ARRAY(wxNotebookPage *, wxArrayPages);
 
 
 WX_DEFINE_EXPORTED_ARRAY(wxNotebookPage *, wxArrayPages);