diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h index d34d1a1a89..defce67bb4 100644 --- a/include/wx/html/htmlpars.h +++ b/include/wx/html/htmlpars.h @@ -228,9 +228,9 @@ public: virtual void SetParser(wxHtmlParser *parser) { m_Parser = parser; } - virtual wxHtmlParser* GetParser() const - { return m_Parser; } - + // Get the parser associated with this tag handler. + wxHtmlParser* GetParser() const { return m_Parser; } + // Returns list of supported tags. The list is in uppercase and // tags are delimited by ','. // Example : "I,B,FONT,P" diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index 562a9dd37d..3347e4e369 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -269,7 +269,6 @@ public: wxHtmlWinTagHandler() : wxHtmlTagHandler() {} virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;} - virtual wxHtmlWinParser* GetParser() const { return (wxHtmlWinParser*)m_Parser; } protected: wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted diff --git a/interface/wx/html/htmlpars.h b/interface/wx/html/htmlpars.h index 0bdd74f285..361df93854 100644 --- a/interface/wx/html/htmlpars.h +++ b/interface/wx/html/htmlpars.h @@ -72,8 +72,10 @@ public: /** Returns the parser associated with this tag handler. + + @since 2.9.5 */ - virtual wxHtmlParser* GetParser() const; + wxHtmlParser* GetParser() const; protected: diff --git a/interface/wx/html/winpars.h b/interface/wx/html/winpars.h index 89ecf8d402..a13a675454 100644 --- a/interface/wx/html/winpars.h +++ b/interface/wx/html/winpars.h @@ -55,18 +55,13 @@ public: Constructor. */ wxHtmlWinTagHandler(); - + /** Assigns @a parser to this handler. Each @b instance of handler is guaranteed to be called only from the one parser. */ virtual void SetParser(wxHtmlWinParser* parser); - /** - Returns the parser associated with this tag handler. - */ - virtual wxHtmlWinParser* GetParser() const; - protected: /** Value of this attribute is identical to value of m_Parser.