X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9026ad85a9792a6e5a6b41320886b154c38a9d0d..019a60d62560638a65bb575e7e30938c7e667450:/include/wx/msw/notebook.h diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 586144ed87..7ac0e7945b 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -18,9 +18,9 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifndef _DYNARRAY_H - #include -#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