Small fixes after wxHtmlTagHandler::GetParser() addition.

Amend the changes of r73839:

- Don't use covariant return type for wxHtmlWinTagHandler::GetParser() as
  VC6, which we still support, doesn't like it. Besides, this seems
  unnecessary.

- Don't make GetParser() virtual at all as this doesn't appear to be necessary
  neither.

- Add "@since 2.9.5" to the documentation of the new method.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-04-25 09:35:38 +00:00
parent d929eddf3a
commit 3f7564f229
4 changed files with 7 additions and 11 deletions

View File

@ -228,9 +228,9 @@ public:
virtual void SetParser(wxHtmlParser *parser) virtual void SetParser(wxHtmlParser *parser)
{ m_Parser = parser; } { m_Parser = parser; }
virtual wxHtmlParser* GetParser() const // Get the parser associated with this tag handler.
{ return m_Parser; } wxHtmlParser* GetParser() const { return m_Parser; }
// Returns list of supported tags. The list is in uppercase and // Returns list of supported tags. The list is in uppercase and
// tags are delimited by ','. // tags are delimited by ','.
// Example : "I,B,FONT,P" // Example : "I,B,FONT,P"

View File

@ -269,7 +269,6 @@ public:
wxHtmlWinTagHandler() : wxHtmlTagHandler() {} wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;} virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}
virtual wxHtmlWinParser* GetParser() const { return (wxHtmlWinParser*)m_Parser; }
protected: protected:
wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted

View File

@ -72,8 +72,10 @@ public:
/** /**
Returns the parser associated with this tag handler. Returns the parser associated with this tag handler.
@since 2.9.5
*/ */
virtual wxHtmlParser* GetParser() const; wxHtmlParser* GetParser() const;
protected: protected:

View File

@ -55,18 +55,13 @@ public:
Constructor. Constructor.
*/ */
wxHtmlWinTagHandler(); wxHtmlWinTagHandler();
/** /**
Assigns @a parser to this handler. Each @b instance of handler Assigns @a parser to this handler. Each @b instance of handler
is guaranteed to be called only from the one parser. is guaranteed to be called only from the one parser.
*/ */
virtual void SetParser(wxHtmlWinParser* parser); virtual void SetParser(wxHtmlWinParser* parser);
/**
Returns the parser associated with this tag handler.
*/
virtual wxHtmlWinParser* GetParser() const;
protected: protected:
/** /**
Value of this attribute is identical to value of m_Parser. Value of this attribute is identical to value of m_Parser.