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

42
include/wx/univ/notebook.h
View File

@@ -62,30 +62,30 @@ public:
// implement wxNotebookBase pure virtuals
// --------------------------------------
virtual int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
virtual int SetSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); }
// changes selected page without sending events
int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }
int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); }
virtual bool SetPageText(size_t nPage, const wxString& strText);
virtual wxString GetPageText(size_t nPage) const;
virtual bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE;
virtual wxString GetPageText(size_t nPage) const wxOVERRIDE;
virtual int GetPageImage(size_t nPage) const;
virtual bool SetPageImage(size_t nPage, int nImage);
virtual int GetPageImage(size_t nPage) const wxOVERRIDE;
virtual bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE;
virtual void SetPageSize(const wxSize& size);
virtual void SetPadding(const wxSize& padding);
virtual void SetTabSize(const wxSize& sz);
virtual void SetPageSize(const wxSize& size) wxOVERRIDE;
virtual void SetPadding(const wxSize& padding) wxOVERRIDE;
virtual void SetTabSize(const wxSize& sz) wxOVERRIDE;
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE;
virtual bool DeleteAllPages();
virtual bool DeleteAllPages() wxOVERRIDE;
virtual bool InsertPage(size_t nPage,
wxNotebookPage *pPage,
const wxString& strText,
bool bSelect = false,
int imageId = NO_IMAGE);
int imageId = NO_IMAGE) wxOVERRIDE;
// style tests
// -----------
@@ -103,17 +103,17 @@ public:
// hit testing
// -----------
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE;
// input handling
// --------------
virtual bool PerformAction(const wxControlAction& action,
long numArg = 0l,
const wxString& strArg = wxEmptyString);
const wxString& strArg = wxEmptyString) wxOVERRIDE;
static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) wxOVERRIDE
{
return GetStdInputHandler(handlerDef);
}
@@ -122,19 +122,19 @@ public:
void RefreshCurrent();
protected:
virtual wxNotebookPage *DoRemovePage(size_t nPage);
virtual wxNotebookPage *DoRemovePage(size_t nPage) wxOVERRIDE;
// drawing
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n);
// resizing
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
int DoSetSelection(size_t nPage, int flags = 0);
int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE;
// common part of all ctors
void Init();
@@ -193,7 +193,7 @@ protected:
wxRect GetPagePart() const;
// get the page rect in our client coords
wxRect GetPageRect() const;
wxRect GetPageRect() const wxOVERRIDE;
// get our client size from the page size
wxSize GetSizeForPage(const wxSize& size) const;