Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 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/html/htmlfilt.cpp
View File

@@ -84,8 +84,8 @@ class wxHtmlFilterImage : public wxHtmlFilter
DECLARE_DYNAMIC_CLASS(wxHtmlFilterImage)
public:
virtual bool CanRead(const wxFSFile& file) const;
virtual wxString ReadFile(const wxFSFile& file) const;
virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE;
virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE;
};
IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter)
@@ -191,13 +191,13 @@ class wxHtmlFilterModule : public wxModule
DECLARE_DYNAMIC_CLASS(wxHtmlFilterModule)
public:
virtual bool OnInit()
virtual bool OnInit() wxOVERRIDE
{
wxHtmlWindow::AddFilter(new wxHtmlFilterHTML);
wxHtmlWindow::AddFilter(new wxHtmlFilterImage);
return true;
}
virtual void OnExit() {}
virtual void OnExit() wxOVERRIDE {}
};
IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule)