Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/simplebook.h
View File

@@ -85,7 +85,7 @@ public:
wxWindow *page,
const wxString& text,
bool bSelect = false,
int imageId = NO_IMAGE)
int imageId = NO_IMAGE) wxOVERRIDE
{
if ( !wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId) )
return false;
@@ -98,19 +98,19 @@ public:
return true;
}
virtual int SetSelection(size_t n)
virtual int SetSelection(size_t n) wxOVERRIDE
{
return DoSetSelection(n, SetSelection_SendEvent);
}
virtual int ChangeSelection(size_t n)
virtual int ChangeSelection(size_t n) wxOVERRIDE
{
return DoSetSelection(n);
}
// Neither labels nor images are supported but we still store the labels
// just in case the user code attaches some importance to them.
virtual bool SetPageText(size_t n, const wxString& strText)
virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE
{
wxCHECK_MSG( n < GetPageCount(), false, wxS("Invalid page") );
@@ -119,41 +119,41 @@ public:
return true;
}
virtual wxString GetPageText(size_t n) const
virtual wxString GetPageText(size_t n) const wxOVERRIDE
{
wxCHECK_MSG( n < GetPageCount(), wxString(), wxS("Invalid page") );
return m_pageTexts[n];
}
virtual bool SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))
virtual bool SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) wxOVERRIDE
{
return false;
}
virtual int GetPageImage(size_t WXUNUSED(n)) const
virtual int GetPageImage(size_t WXUNUSED(n)) const wxOVERRIDE
{
return NO_IMAGE;
}
protected:
virtual void UpdateSelectedPage(size_t newsel)
virtual void UpdateSelectedPage(size_t newsel) wxOVERRIDE
{
m_selection = newsel;
}
virtual wxBookCtrlEvent* CreatePageChangingEvent() const
virtual wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE
{
return new wxBookCtrlEvent(wxEVT_BOOKCTRL_PAGE_CHANGING,
GetId());
}
virtual void MakeChangedEvent(wxBookCtrlEvent& event)
virtual void MakeChangedEvent(wxBookCtrlEvent& event) wxOVERRIDE
{
event.SetEventType(wxEVT_BOOKCTRL_PAGE_CHANGED);
}
virtual wxWindow *DoRemovePage(size_t page)
virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE
{
wxWindow* const win = wxBookCtrlBase::DoRemovePage(page);
if ( win )
@@ -166,14 +166,14 @@ protected:
return win;
}
virtual void DoSize()
virtual void DoSize() wxOVERRIDE
{
wxWindow* const page = GetCurrentPage();
if ( page )
page->SetSize(GetPageRect());
}
virtual void DoShowPage(wxWindow* page, bool show)
virtual void DoShowPage(wxWindow* page, bool show) wxOVERRIDE
{
if ( show )
page->ShowWithEffect(m_showEffect, m_showTimeout);