Make wxDataObjectComposite::GetObject() public.

[wxWidgets.git] / interface / wx / html / htmltag.h

diff --git a/interface/wx/html/htmltag.h b/interface/wx/html/htmltag.h
index e5ef38cb4475c2b128573800397396b73da2fae9..3745c06d8be9bd6f264ca596613fd92ebef3ae63 100644 (file)
--- a/interface/wx/html/htmltag.h
+++ b/interface/wx/html/htmltag.h
@@ -33,7 +33,7 @@ public:
         Example: tag contains \<FONT SIZE=+2 COLOR="#000000"\>.
         Call to tag.GetAllParams() would return @c 'SIZE=+2 COLOR="#000000"'.
     */
-    const wxString GetAllParams() const;
+    wxString GetAllParams() const;
 
     /**
         Returns beginning position of the text @e between this tag and paired
@@ -73,7 +73,7 @@ public:
 
     /**
         Returns tag's name. The name is always in uppercase and it doesn't contain
-        " or '/' characters. (So the name of \<FONT SIZE=+2\> tag is "FONT"
+        &quot; or '/' characters. (So the name of \<FONT SIZE=+2\> tag is "FONT"
         and name of \</table\> is "TABLE").
     */
     wxString GetName() const;
@@ -148,6 +148,7 @@ public:
     */
     bool HasParam(const wxString& par) const;
 
+    //@{
     /**
         This method scans the given parameter. Usage is exactly the same as sscanf's
         usage except that you don't pass a string but a parameter name as the first
@@ -161,6 +162,8 @@ public:
         @param value
             pointer to a variable to store the value in
     */
-    wxString ScanParam(const wxString& par, const wxChar* format, void* value) const;
+    int ScanParam(const wxString& par, const wchar_t* format, void* value) const;
+    int ScanParam(const wxString& par, const char* format, void* value) const;
+    //@}
 };