X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdf1e7142564c55f5299f1f2d0909090534eb97c..0767cb6f445806aaddd49014dca21d39cb4b3688:/include/wx/os2/notebook.h?ds=inline diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h index fece36062d..39415272d8 100644 --- a/include/wx/os2/notebook.h +++ b/include/wx/os2/notebook.h @@ -14,9 +14,10 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifndef _DYNARRAY_H - #include -#endif //_DYNARRAY_H + +#include "wx/dynarray.h" +#include "wx/string.h" +#include "wx/control.h" // ---------------------------------------------------------------------------- // types @@ -28,7 +29,7 @@ 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 @@ -151,7 +152,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)