made GetPage() not virtual because it doesn't need to be virtual and this allows to have const overload of it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -73,14 +73,14 @@ public:
|
|||||||
virtual size_t GetPageCount() const { return m_pages.size(); }
|
virtual size_t GetPageCount() const { return m_pages.size(); }
|
||||||
|
|
||||||
// get the panel which represents the given page
|
// get the panel which represents the given page
|
||||||
virtual wxWindow *GetPage(size_t n) { return m_pages[n]; }
|
wxWindow *GetPage(size_t n) { return m_pages[n]; }
|
||||||
|
wxWindow *GetPage(size_t n) const { return m_pages[n]; }
|
||||||
|
|
||||||
// get the current page or NULL if none
|
// get the current page or NULL if none
|
||||||
wxWindow *GetCurrentPage() const
|
wxWindow *GetCurrentPage() const
|
||||||
{
|
{
|
||||||
int n = GetSelection();
|
const int n = GetSelection();
|
||||||
return n == wxNOT_FOUND ? NULL
|
return n == wxNOT_FOUND ? NULL : GetPage(n);
|
||||||
: wx_const_cast(wxBookCtrlBase *, this)->GetPage(n);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the currently selected page or wxNOT_FOUND if none
|
// get the currently selected page or wxNOT_FOUND if none
|
||||||
@@ -191,6 +191,7 @@ protected:
|
|||||||
// Always rely on GetBestSize, which will look at all the pages
|
// Always rely on GetBestSize, which will look at all the pages
|
||||||
virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
|
virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
|
||||||
|
|
||||||
|
|
||||||
// the array of all pages of this control
|
// the array of all pages of this control
|
||||||
wxArrayPages m_pages;
|
wxArrayPages m_pages;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user