Add wxOVERRIDE and use it in common and wxOSX code.

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

View File

@@ -161,7 +161,7 @@ class wxHtmlListBoxStyle : public wxDefaultHtmlRenderingStyle
public:
wxHtmlListBoxStyle(const wxHtmlListBox& hlbox) : m_hlbox(hlbox) { }
virtual wxColour GetSelectedTextColour(const wxColour& colFg)
virtual wxColour GetSelectedTextColour(const wxColour& colFg) wxOVERRIDE
{
// by default wxHtmlListBox doesn't implement GetSelectedTextColour()
// and returns wxNullColour from it, so use the default HTML colour for
@@ -175,7 +175,7 @@ public:
return col;
}
virtual wxColour GetSelectedTextBgColour(const wxColour& colBg)
virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) wxOVERRIDE
{
wxColour col = m_hlbox.GetSelectedTextBgColour(colBg);
if ( !col.IsOk() )