X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f5e1e78fe906050ff2fee9529476db332633f0..3a74a290a9fcfafd93fd1a23e6857ad60836cb9d:/interface/wx/html/htmltag.h

diff --git a/interface/wx/html/htmltag.h b/interface/wx/html/htmltag.h
index 6e4cf6fb35..0f2c67a4a3 100644
--- a/interface/wx/html/htmltag.h
+++ b/interface/wx/html/htmltag.h
@@ -13,20 +13,21 @@
     It is used by @ref overview_handlers "tag handlers".
 
     @library{wxhtml}
-    @category{FIXME}
+    @category{html}
 */
 class wxHtmlTag
 {
-public:
+protected:
     /**
         Constructor. You will probably never have to construct a wxHtmlTag object
         yourself. Feel free to ignore the constructor parameters.
         Have a look at src/html/htmlpars.cpp if you're interested in creating it.
     */
-    wxHtmlTag(wxHtmlTag* parent, const wxString& source, int pos,
-              int end_pos, wxHtmlTagsCache* cache,
-              wxHtmlEntitiesParser* entParser);
+    wxHtmlTag(wxHtmlTag* parent, const wxString* source,
+              const const_iterator& pos, const const_iterator& end_pos,
+              wxHtmlTagsCache* cache, wxHtmlEntitiesParser* entParser);
 
+public:
     /**
         Returns a string containing all parameters.
         Example : tag contains @c FONT SIZE=+2 COLOR="#000000". Call to
@@ -38,6 +39,7 @@ public:
         Returns beginning position of the text @e between this tag and paired
         ending tag.
         See explanation (returned position is marked with '|'):
+        @deprecated @todo provide deprecation description
     */
     int GetBeginPos() const;
 
@@ -45,6 +47,7 @@ public:
         Returns ending position of the text @e between this tag and paired
         ending tag.
         See explanation (returned position is marked with '|'):
+        @deprecated @todo provide deprecation description
     */
     int GetEndPos1() const;
 
@@ -52,6 +55,7 @@ public:
         Returns ending position 2 of the text @e between this tag and paired
         ending tag.
         See explanation (returned position is marked with '|'):
+        @deprecated @todo provide deprecation description
     */
     int GetEndPos2() const;
 
@@ -65,7 +69,7 @@ public:
     /**
         Returns the value of the parameter. You should check whether the
         parameter exists or not (use wxHtmlTag::HasParam) first.
-        
+
         @param par
             The parameter's name.
         @param with_quotes
@@ -92,7 +96,7 @@ public:
     /**
         Returns @true if this tag is paired with ending tag, @false otherwise.
         See the example of HTML document:
-        
+
         In this example tags HTML and BODY have ending tags, first P and BR
         doesn't have ending tag while the second P has. The third P tag (which
         is ending itself) of course doesn't have ending tag.
@@ -101,9 +105,9 @@ public:
 
     /**
         Returns @true if the tag has a parameter of the given name.
-        Example : @c FONT SIZE=+2 COLOR="#FF00FF" has two parameters named
+        Example : @c FONT SIZE=+2 COLOR="\#FF00FF" has two parameters named
         "SIZE" and "COLOR".
-        
+
         @param par
             the parameter you're looking for.
     */
@@ -115,7 +119,7 @@ public:
         argument
         and you can only retrieve one value (i.e. you can use only one "%" element
         in @e format).
-        
+
         @param par
             The name of the tag you want to query
         @param format