X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae3c17b4013e80b99976c750c19fca47729517f6..5a45dd6fd9870de6b68eff437fd5fe4ea5895c3c:/interface/wx/html/winpars.h?ds=sidebyside

diff --git a/interface/wx/html/winpars.h b/interface/wx/html/winpars.h
index ed5d5348b1..232ba50760 100644
--- a/interface/wx/html/winpars.h
+++ b/interface/wx/html/winpars.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxHtmlTagsModule
-    @headerfile winpars.h wx/html/winpars.h
 
     This class provides easy way of filling wxHtmlWinParser's table of
     tag handlers. It is used almost exclusively together with the set of
@@ -32,14 +31,13 @@ public:
         @param parser
             Pointer to the parser that requested tables filling.
     */
-    virtual void FillHandlersTable(wxHtmlWinParser parser);
+    virtual void FillHandlersTable(wxHtmlWinParser*);
 };
 
 
 
 /**
     @class wxHtmlWinTagHandler
-    @headerfile winpars.h wx/html/winpars.h
 
     This is basically wxHtmlTagHandler except that
     it is extended with protected member m_WParser pointing to
@@ -64,7 +62,6 @@ public:
 
 /**
     @class wxHtmlWinParser
-    @headerfile winpars.h wx/html/winpars.h
 
     This class is derived from wxHtmlParser and
     its main goal is to parse HTML input so that it can be displayed in
@@ -116,7 +113,7 @@ public:
     /**
         Returns actual text colour.
     */
-    const wxColour GetActualColor() const;
+    const wxColour& GetActualColor() const;
 
     /**
         Returns default horizontal alignment.
@@ -198,12 +195,12 @@ public:
         if the parser is between @c A and @c /A tags,
         wxEmptyString otherwise.)
     */
-    const wxHtmlLinkInfo GetLink() const;
+    const wxHtmlLinkInfo& GetLink() const;
 
     /**
         Returns the colour of hypertext link text.
     */
-    const wxColour GetLinkColor() const;
+    const wxColour& GetLinkColor() const;
 
     /**
         Returns output encoding, i.e. closest match to document's input encoding
@@ -250,7 +247,7 @@ public:
         HTML are given in pixels -- e.g. image sizes. 300x300 image would be only one
         inch wide on typical printer. With pixel_scale = 3.0 it would be 3 inches.)
     */
-    virtual void SetDC(wxDC dc, double pixel_scale = 1.0);
+    virtual void SetDC(wxDC* dc, double pixel_scale = 1.0e+0);
 
     /**
         Sets bold flag of actualfont. @a x is either @true of @false.
@@ -288,9 +285,8 @@ public:
         Sets fonts. See wxHtmlWindow::SetFonts for
         detailed description.
     */
-    void SetFonts(const wxString& normal_face,
-                  const wxString& fixed_face,
-                  const int sizes = NULL);
+    void SetFonts(const wxString& normal_face, const wxString& fixed_face,
+                  const int* sizes = 0);
 
     /**
         Sets input encoding. The parser uses this information to build conversion