/////////////////////////////////////////////////////////////////////////////
-// Name: htmltag.cpp
+// Name: src/html/htmltag.cpp
// Purpose: wxHtmlTag class (represents single tag)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// 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
#endif
-#include "wx/html/htmltag.h"
#include "wx/html/htmlpars.h"
#include "wx/colour.h"
#include <stdio.h> // for vsscanf
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;
else
{
m_Cache[tg].End1 = m_Cache[tg].End2 = -1;
-
+
if (wxIsCDATAElement(tagBuffer))
{
// store the orig pos in case we are missing the closing
// tag (see below)
- wxInt32 old_pos = pos;
+ wxInt32 old_pos = pos;
bool foundCloseTag = false;
-
+
// find next matching tag
int tag_len = wxStrlen(tagBuffer);
while (pos < lng)
}
// found a match
- if (match_pos == tag_len)
+ if (match_pos == tag_len)
{
pos = pos - tag_len - 3;
foundCloseTag = true;
}
#undef IS_WHITE
- }
- m_Begin = i;
+ }
+ m_Begin = i;
- cache->QueryTag(pos, &m_End1, &m_End2);
- if (m_End1 > end_pos) m_End1 = end_pos;
- if (m_End2 > end_pos) m_End2 = end_pos;
+ cache->QueryTag(pos, &m_End1, &m_End2);
+ if (m_End1 > end_pos) m_End1 = end_pos;
+ if (m_End2 > end_pos) m_End2 = end_pos;
}
wxHtmlTag::~wxHtmlTag()
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) \
return cur->m_Next;
}
-#if WXWIN_COMPATIBILITY_2_2
-
-bool wxHtmlTag::IsEnding() const
-{
- return false;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-
#endif