X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/614f97138990406a2dec8d3af6eda4cce6b64224..d929eddf3a3dbb04f37624d255f4e24e07595ca1:/include/wx/html/htmltag.h

diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index 40bcf48871..4ff2164beb 100644
--- a/include/wx/html/htmltag.h
+++ b/include/wx/html/htmltag.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        htmltag.h
+// Name:        wx/html/htmltag.h
 // Purpose:     wxHtmlTag class (represents single tag)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -47,7 +47,7 @@ public:
                   wxString::const_iterator *end2,
                   bool *hasEnding);
 
-    DECLARE_NO_COPY_CLASS(wxHtmlTagsCache)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlTagsCache);
 };
 
 
@@ -97,9 +97,15 @@ public:
     //                           (or ("WhaT.jpg") if with_quotes == true)
     wxString GetParam(const wxString& par, bool with_quotes = false) const;
 
+    // Return true if the string could be parsed as an HTML colour and false
+    // otherwise.
+    static bool ParseAsColour(const wxString& str, wxColour *clr);
+
     // Convenience functions:
     bool GetParamAsColour(const wxString& par, wxColour *clr) const;
     bool GetParamAsInt(const wxString& par, int *clr) const;
+    bool GetParamAsIntOrPercent(const wxString& param,
+                                int* value, bool& isPercent) const;
 
     // Scans param like scanf() functions family does.
     // Example : ScanParam("COLOR", "\"#%X\"", &clr);
@@ -126,13 +132,11 @@ public:
     // returns ending position of _internal_ block of text as iterator
     // into parser's source string (see wxHtmlParser::GetSource()):
     // bla bla bla <MYTAG> bla bla intenal text*</MYTAG> bla bla
-    wxString::const_iterator GetEndIter1() const
-        { wxASSERT(m_hasEnding); return m_End1; }
+    wxString::const_iterator GetEndIter1() const { return m_End1; }
     // returns end position 2 as iterator
     // into parser's source string (see wxHtmlParser::GetSource()):
     // bla bla bla <MYTAG> bla bla internal text</MYTAG>* bla bla
-    wxString::const_iterator GetEndIter2() const
-        { wxASSERT(m_hasEnding); return m_End2; }
+    wxString::const_iterator GetEndIter2() const { return m_End2; }
 
 #if WXWIN_COMPATIBILITY_2_8
     // use GetBeginIter(), GetEndIter1() and GetEndIter2() instead
@@ -156,7 +160,7 @@ private:
     wxHtmlTag *m_FirstChild, *m_LastChild;
     wxHtmlTag *m_Parent;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlTag)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlTag);
 };