Use wxVector<> for wxBookCtrlBase::m_pages array

Get rid of another macro-based array in favour of wxVector<>.

No real changes.
This commit is contained in:
Vadim Zeitlin
2018-03-25 00:38:16 +01:00
parent 3d37b8c72a
commit bee28c2730
8 changed files with 22 additions and 24 deletions

View File

@@ -20,11 +20,9 @@
#if wxUSE_BOOKCTRL
#include "wx/control.h"
#include "wx/dynarray.h"
#include "wx/vector.h"
#include "wx/withimages.h"
WX_DEFINE_EXPORTED_ARRAY_PTR(wxWindow *, wxArrayPages);
class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_FWD_CORE wxBookCtrlEvent;
@@ -94,7 +92,7 @@ public:
virtual size_t GetPageCount() const { return m_pages.size(); }
// get the panel which represents the given page
virtual wxWindow *GetPage(size_t n) const { return m_pages[n]; }
virtual wxWindow *GetPage(size_t n) const { return m_pages.at(n); }
// get the current page or NULL if none
wxWindow *GetCurrentPage() const
@@ -331,7 +329,7 @@ protected:
// the array of all pages of this control
wxArrayPages m_pages;
wxVector<wxWindow*> m_pages;
// get the page area
virtual wxRect GetPageRect() const;