X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d0f3cd6ac9b38521b35f21cb94ef7d72aa34b9e..f547e9bb27ed4fb6a05148c88dd4da43aed310dd:/include/wx/msw/notebook.h?ds=inline

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 934be28047..7ac0e7945b 100644
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -18,9 +18,9 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#ifndef   _DYNARRAY_H
-  #include <wx/dynarray.h>
-#endif  //_DYNARRAY_H
+
+#include "wx/control.h"
+#include "wx/dynarray.h"
 
 // ----------------------------------------------------------------------------
 // types
@@ -33,13 +33,7 @@ class WXDLLEXPORT wxWindow;
 // array of notebook pages
 typedef wxWindow WXDLLEXPORT wxNotebookPage;  // so far, any window can be a page
 
-#undef WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL WXDLLEXPORT
-
-WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
-
-#undef  WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL
+WX_DEFINE_EXPORTED_ARRAY(wxNotebookPage *, wxArrayPages);
 
 // ----------------------------------------------------------------------------
 // wxNotebook
@@ -143,7 +137,7 @@ public:
 
   // callbacks
   // ---------
-  void OnWindowCreate(wxWindowCreateEvent& event);
+  void OnSize(wxSizeEvent& event);
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);