X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7448de8d8d697f8f208515a1fc96c88ed009dd56..1ae82ba9f23ee688bc4db2cd449eca5bf97cfdf0:/src/html/htmltag.cpp diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index 1ac1e8d09e..6686cb9cba 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: htmltag.cpp +// Name: src/html/htmltag.cpp // Purpose: wxHtmlTag class (represents single tag) // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -7,26 +7,21 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/wxprec.h" -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "htmltag.h" +#ifdef __BORLANDC__ + #pragma hdrstop #endif -#include "wx/wxprec.h" - -#include "wx/defs.h" #if wxUSE_HTML -#ifdef __BORLANDC__ -#pragma hdrstop -#endif +#include "wx/html/htmltag.h" #ifndef WXPRECOMP + #include "wx/colour.h" #endif -#include "wx/html/htmltag.h" #include "wx/html/htmlpars.h" -#include "wx/colour.h" #include // for vsscanf #include @@ -66,7 +61,7 @@ bool wxIsCDATAElement(const wxChar *tag) wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) { const wxChar *src = source.c_str(); - int lng = source.Length(); + int lng = source.length(); wxChar tagBuffer[256]; m_Cache = NULL; @@ -416,20 +411,13 @@ int wxHtmlTag::ScanParam(const wxString& par, bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const { + wxASSERT(clr); wxString str = GetParam(par); - if (str.empty()) return false; - if (str.GetChar(0) == wxT('#')) - { - unsigned long tmp; - if (ScanParam(par, wxT("#%lX"), &tmp) != 1) - return false; - *clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16), - (unsigned char)((tmp & 0x00FF00) >> 8), - (unsigned char)(tmp & 0x0000FF)); + if (clr->Set(str)) return true; - } - else + + if (!str.empty()) { // Handle colours defined in HTML 4.0: #define HTML_COLOUR(name,r,g,b) \ @@ -521,13 +509,4 @@ wxHtmlTag *wxHtmlTag::GetNextTag() const return cur->m_Next; } -#if WXWIN_COMPATIBILITY_2_2 - -bool wxHtmlTag::IsEnding() const -{ - return false; -} - -#endif // WXWIN_COMPATIBILITY_2_2 - #endif