From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Apr 2013 09:35:38 +0000 (+0000)
Subject: Small fixes after wxHtmlTagHandler::GetParser() addition.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3f7564f229450a9c036141878ee75cc09078a945

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
---

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.