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

8
src/propgrid/editors.cpp
View File

@@ -661,7 +661,7 @@ public:
virtual void OnDrawItem( wxDC& dc,
const wxRect& rect,
int item,
int flags ) const
int flags ) const wxOVERRIDE
{
wxPropertyGrid* pg = GetGrid();
@@ -677,7 +677,7 @@ public:
}
}
virtual wxCoord OnMeasureItem( size_t item ) const
virtual wxCoord OnMeasureItem( size_t item ) const wxOVERRIDE
{
wxPropertyGrid* pg = GetGrid();
wxRect rect;
@@ -695,7 +695,7 @@ public:
return pg;
}
virtual wxCoord OnMeasureItemWidth( size_t item ) const
virtual wxCoord OnMeasureItemWidth( size_t item ) const wxOVERRIDE
{
wxPropertyGrid* pg = GetGrid();
wxRect rect;
@@ -706,7 +706,7 @@ public:
}
virtual void PositionTextCtrl( int textCtrlXAdjust,
int WXUNUSED(textCtrlYAdjust) )
int WXUNUSED(textCtrlYAdjust) ) wxOVERRIDE
{
wxPropertyGrid* pg = GetGrid();
#ifdef wxPG_TEXTCTRLXADJUST