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

12
src/osx/cocoa/notebook.mm
View File

@@ -178,7 +178,7 @@ public:
{
}
void GetContentArea( int &left , int &top , int &width , int &height ) const
void GetContentArea( int &left , int &top , int &width , int &height ) const wxOVERRIDE
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
NSRect r = [slf contentRect];
@@ -188,7 +188,7 @@ public:
height = (int)r.size.height;
}
void SetValue( wxInt32 value )
void SetValue( wxInt32 value ) wxOVERRIDE
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
// avoid 'changed' events when setting the tab programmatically
@@ -199,7 +199,7 @@ public:
[slf setDelegate:controller];
}
wxInt32 GetValue() const
wxInt32 GetValue() const wxOVERRIDE
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
NSTabViewItem* selectedItem = [slf selectedTabViewItem];
@@ -209,7 +209,7 @@ public:
return [slf indexOfTabViewItem:selectedItem]+1;
}
void SetMaximum( wxInt32 maximum )
void SetMaximum( wxInt32 maximum ) wxOVERRIDE
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
int cocoacount = [slf numberOfTabViewItems ];
@@ -237,7 +237,7 @@ public:
[slf setDelegate:controller];
}
void SetupTabs( const wxNotebook& notebook)
void SetupTabs( const wxNotebook& notebook) wxOVERRIDE
{
int pcount = notebook.GetPageCount();
@@ -261,7 +261,7 @@ public:
}
}
int TabHitTest(const wxPoint & pt, long* flags)
int TabHitTest(const wxPoint & pt, long* flags) wxOVERRIDE
{
int retval = wxNOT_FOUND;