Stupid bug in GAddress initialization prevented BCC to work. (I still

[wxWidgets.git] / src / html / htmlpars.cpp

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 8692fccc9542d9632272d886ff2d8b8425b8a47a..da21362a5ec1db8d1c11ad39fbe465d98a3ad9d3 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -69,11 +69,11 @@ void wxHtmlParser::DoneParser()
 
 
 
 
 
 

-#define HTML_MAX_BUFLEN 1024
+#define wxHTML_MAX_BUFLEN 1024

 
 void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
 {
 
 void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
 {

-    char temp[HTML_BUFLEN], c;
+    char temp[wxHTML_BUFLEN], c;

     int i;
     int templen;
 
     int i;
     int templen;
 


@@ -86,7 +86,7 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
         // continue building word:
         if (c != '<') {
             temp[templen++] = c;
         // 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;
                 temp[templen] = 0;
                 AddText(temp);
                 templen = 0;


@@ -137,11 +137,7 @@ void wxHtmlParser::AddTagHandler(wxHtmlTagHandler *handler)
     wxString s(handler -> GetSupportedTags());
     wxStringTokenizer tokenizer(s, ", ");
 
     wxString s(handler -> GetSupportedTags());
     wxStringTokenizer tokenizer(s, ", ");
 

-#if (wxVERSION_NUMBER < 2100)
-    while (tokenizer.HasMoreToken())
-#else

     while (tokenizer.HasMoreTokens())
     while (tokenizer.HasMoreTokens())

-#endif

         m_HandlersHash.Put(tokenizer.NextToken(), handler);
 
     if (m_HandlersList.IndexOf(handler) == wxNOT_FOUND)
         m_HandlersHash.Put(tokenizer.NextToken(), handler);
 
     if (m_HandlersList.IndexOf(handler) == wxNOT_FOUND)


@@ -166,5 +162,5 @@ wxHtmlParser::~wxHtmlParser()
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxHtmlTagHandler,wxObject)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxHtmlTagHandler,wxObject)

+#endif

 
 

-#endif
\ No newline at end of file