#pragma implementation
#endif
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML
#endif
#ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
#endif
#include "wx/tokenzr.h"
-#define HTML_MAX_BUFLEN 1024
+#define wxHTML_MAX_BUFLEN 1024
void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
{
- char temp[HTML_BUFLEN], c;
+ char temp[wxHTML_BUFLEN], c;
int i;
int templen;
i = begin_pos;
while (i < end_pos) {
- c = m_Source[i];
+ c = m_Source[(unsigned int) i];
// continue building word:
if (c != '<') {
temp[templen++] = c;
- if (templen == HTML_BUFLEN-1) {
+ if (templen == wxHTML_BUFLEN-1) {
temp[templen] = 0;
AddText(temp);
templen = 0;
wxString s(handler -> GetSupportedTags());
wxStringTokenizer tokenizer(s, ", ");
-#if (wxVERSION_NUMBER < 2100)
- while (tokenizer.HasMoreToken())
-#else
while (tokenizer.HasMoreTokens())
-#endif
m_HandlersHash.Put(tokenizer.NextToken(), handler);
if (m_HandlersList.IndexOf(handler) == wxNOT_FOUND)
+void wxHtmlParser::PushTagHandler(wxHtmlTagHandler *handler, wxString tags)
+{
+ wxStringTokenizer tokenizer(tags, ", ");
+ wxString key;
+
+ if (m_HandlersStack == NULL) {
+ m_HandlersStack = new wxList;
+ m_HandlersStack -> DeleteContents(TRUE);
+ }
+
+ m_HandlersStack -> Insert(new wxHashTable(m_HandlersHash));
+
+ while (tokenizer.HasMoreTokens()) {
+ key = tokenizer.NextToken();
+ m_HandlersHash.Delete(key);
+ m_HandlersHash.Put(key, handler);
+ }
+}
+
+
+
+void wxHtmlParser::PopTagHandler()
+{
+ wxNode *first;
+
+ if (m_HandlersStack == NULL || (first = m_HandlersStack -> GetFirst()) == NULL) return;
+ m_HandlersHash = *((wxHashTable*) first -> GetData());
+ m_HandlersStack -> DeleteNode(first);
+}
+
+
+
wxHtmlParser::~wxHtmlParser()
{
+ if (m_HandlersStack) delete m_HandlersStack;
m_HandlersHash.Clear();
m_HandlersList.DeleteContents(TRUE);
m_HandlersList.Clear();