X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6167969572298af47687cbb7ccba1aea202110ac..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/html/htmltag.h diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 3853333866..99d15ee6ff 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -1,8 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: htmltag.h +// Name: wx/html/htmltag.h // Purpose: wxHtmlTag class (represents single tag) // Author: Vaclav Slavik -// RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -47,7 +46,7 @@ public: wxString::const_iterator *end2, bool *hasEnding); - DECLARE_NO_COPY_CLASS(wxHtmlTagsCache) + wxDECLARE_NO_COPY_CLASS(wxHtmlTagsCache); }; @@ -97,9 +96,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); @@ -154,14 +159,14 @@ private: wxHtmlTag *m_FirstChild, *m_LastChild; wxHtmlTag *m_Parent; - DECLARE_NO_COPY_CLASS(wxHtmlTag) + wxDECLARE_NO_COPY_CLASS(wxHtmlTag); }; #if WXWIN_COMPATIBILITY_2_8 -inline int wxHtmlTag::GetBeginPos() const { return m_Begin - m_sourceStart; } -inline int wxHtmlTag::GetEndPos1() const { return m_End1 - m_sourceStart; } -inline int wxHtmlTag::GetEndPos2() const { return m_End2 - m_sourceStart; } +inline int wxHtmlTag::GetBeginPos() const { return int(m_Begin - m_sourceStart); } +inline int wxHtmlTag::GetEndPos1() const { return int(m_End1 - m_sourceStart); } +inline int wxHtmlTag::GetEndPos2() const { return int(m_End2 - m_sourceStart); } #endif // WXWIN_COMPATIBILITY_2_8