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

Add wxOVERRIDE and use it in common and wxOSX code.

Browse Source 
Make overriding virtual methods more explicit and enable additional checks
provided by C++11 compilers when "override" is used.

Closes #16100.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-20 13:26:28 +00:00
parent 34e4f66d6a
commit 33ad33d447
140 changed files with 865 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/generic/renderg.cpp
View File

@@ -55,84 +55,84 @@ public:
const wxRect& rect,
int flags = 0,
wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL);
wxHeaderButtonParams* params = NULL) wxOVERRIDE;
virtual int DrawHeaderButtonContents(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0,
wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL);
wxHeaderButtonParams* params = NULL) wxOVERRIDE;
virtual int GetHeaderButtonHeight(wxWindow *win);
virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE;
virtual int GetHeaderButtonMargin(wxWindow *win);
virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE;
virtual void DrawTreeItemButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawSplitterBorder(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawSplitterSash(wxWindow *win,
wxDC& dc,
const wxSize& size,
wxCoord position,
wxOrientation orient,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawComboBoxDropButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawDropArrow(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawCheckBox(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual wxSize GetCheckBoxSize(wxWindow *win);
virtual wxSize GetCheckBoxSize(wxWindow *win) wxOVERRIDE;
virtual void DrawPushButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawItemSelectionRect(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0);
int flags = 0) wxOVERRIDE;
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0) wxOVERRIDE;
virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0) wxOVERRIDE;
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
virtual void DrawTitleBarBitmap(wxWindow *win,
wxDC& dc,
const wxRect& rect,
wxTitleBarButton button,
int flags = 0);
int flags = 0) wxOVERRIDE;
#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE;
virtual wxRendererVersion GetVersion() const
virtual wxRendererVersion GetVersion() const wxOVERRIDE
{
return wxRendererVersion(wxRendererVersion::Current_Version,
wxRendererVersion::Current_Age);
@@ -802,8 +802,8 @@ class wxGenericRendererModule: public wxModule
DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)
public:
wxGenericRendererModule() {}
bool OnInit() { return true; }
void OnExit() { wxRendererGeneric::Cleanup(); }
bool OnInit() wxOVERRIDE { return true; }
void OnExit() wxOVERRIDE { wxRendererGeneric::Cleanup(); }
};
IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)