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

16
src/osx/cocoa/srchctrl.mm
View File

@@ -101,7 +101,7 @@ public :
~wxNSSearchFieldControl();
// search field options
virtual void ShowSearchButton( bool show )
virtual void ShowSearchButton( bool show ) wxOVERRIDE
{
if ( show )
[m_searchFieldCell resetSearchButtonCell];
@@ -110,12 +110,12 @@ public :
[m_searchField setNeedsDisplay:YES];
}
virtual bool IsSearchButtonVisible() const
virtual bool IsSearchButtonVisible() const wxOVERRIDE
{
return [m_searchFieldCell searchButtonCell] != nil;
}
virtual void ShowCancelButton( bool show )
virtual void ShowCancelButton( bool show ) wxOVERRIDE
{
if ( show )
[m_searchFieldCell resetCancelButtonCell];
@@ -124,12 +124,12 @@ public :
[m_searchField setNeedsDisplay:YES];
}
virtual bool IsCancelButtonVisible() const
virtual bool IsCancelButtonVisible() const wxOVERRIDE
{
return [m_searchFieldCell cancelButtonCell] != nil;
}
virtual void SetSearchMenu( wxMenu* menu )
virtual void SetSearchMenu( wxMenu* menu ) wxOVERRIDE
{
if ( menu )
[m_searchFieldCell setSearchMenuTemplate:menu->GetHMenu()];
@@ -138,18 +138,18 @@ public :
[m_searchField setNeedsDisplay:YES];
}
virtual void SetDescriptiveText(const wxString& text)
virtual void SetDescriptiveText(const wxString& text) wxOVERRIDE
{
[m_searchFieldCell setPlaceholderString:
wxCFStringRef( text , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
}
virtual bool SetFocus()
virtual bool SetFocus() wxOVERRIDE
{
return wxNSTextFieldControl::SetFocus();
}
void controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))
void controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender)) wxOVERRIDE
{
wxSearchCtrl* wxpeer = (wxSearchCtrl*) GetWXPeer();
if ( wxpeer )