Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/cshelp.h
View File

@@ -204,14 +204,14 @@ class WXDLLIMPEXP_CORE wxSimpleHelpProvider : public wxHelpProvider
{
public:
// implement wxHelpProvider methods
virtual wxString GetHelp(const wxWindowBase *window);
virtual wxString GetHelp(const wxWindowBase *window) wxOVERRIDE;
// override ShowHelp() and not ShowHelpAtPoint() as explained above
virtual bool ShowHelp(wxWindowBase *window);
virtual bool ShowHelp(wxWindowBase *window) wxOVERRIDE;
virtual void AddHelp(wxWindowBase *window, const wxString& text);
virtual void AddHelp(wxWindowID id, const wxString& text);
virtual void RemoveHelp(wxWindowBase* window);
virtual void AddHelp(wxWindowBase *window, const wxString& text) wxOVERRIDE;
virtual void AddHelp(wxWindowID id, const wxString& text) wxOVERRIDE;
virtual void RemoveHelp(wxWindowBase* window) wxOVERRIDE;
protected:
// we use 2 hashes for storing the help strings associated with windows
@@ -235,7 +235,7 @@ public:
// again (see above): this should be ShowHelpAtPoint() but we need to
// override ShowHelp() to avoid breaking existing code
virtual bool ShowHelp(wxWindowBase *window);
virtual bool ShowHelp(wxWindowBase *window) wxOVERRIDE;
// Other accessors
void SetHelpController(wxHelpControllerBase* hc) { m_helpController = hc; }