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

16
include/wx/html/winpars.h
View File

@@ -42,11 +42,11 @@ public:
virtual ~wxHtmlWinParser();
virtual void InitParser(const wxString& source);
virtual void DoneParser();
virtual wxObject* GetProduct();
virtual void InitParser(const wxString& source) wxOVERRIDE;
virtual void DoneParser() wxOVERRIDE;
virtual wxObject* GetProduct() wxOVERRIDE;
virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const;
virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const wxOVERRIDE;
// Set's the DC used for parsing. If SetDC() is not called,
// parsing won't proceed
@@ -163,7 +163,7 @@ public:
WhitespaceMode GetWhitespaceMode() const { return m_whitespaceMode; }
protected:
virtual void AddText(const wxString& txt);
virtual void AddText(const wxString& txt) wxOVERRIDE;
private:
void FlushWordBuf(wxChar *temp, int& len);
@@ -263,7 +263,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
public:
wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}
virtual void SetParser(wxHtmlParser *parser) wxOVERRIDE {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}
protected:
wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
@@ -293,8 +293,8 @@ class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule
public:
wxHtmlTagsModule() : wxModule() {}
virtual bool OnInit();
virtual void OnExit();
virtual bool OnInit() wxOVERRIDE;
virtual void OnExit() wxOVERRIDE;
// This is called by wxHtmlWinParser.
// The method must simply call parser->AddTagHandler(new