applied patch for compilation with gcc 3.0

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

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index 6fc8e6cca3546cfb09ddaac87367051da349abca..56cb687606374af49f737e1bb31f909971c42790 100644 (file)
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -30,12 +30,28 @@
 #include <stdarg.h>
 
 
 #include <stdarg.h>
 
 

-
-

 //-----------------------------------------------------------------------------
 // wxHtmlTagsCache
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxHtmlTagsCache
 //-----------------------------------------------------------------------------
 

+struct wxHtmlCacheItem
+{
+    // this is "pos" value passed to wxHtmlTag's constructor.
+    // it is position of '<' character of the tag
+    int Key;
+
+    // end positions for the tag:
+    // end1 is '<' of ending tag,
+    // end2 is '>' or both are
+    // -1 if there is no ending tag for this one...
+    // or -2 if this is ending tag  </...>
+    int End1, End2;
+
+    // name of this tag
+    wxChar *Name;
+};
+
+

 IMPLEMENT_CLASS(wxHtmlTagsCache,wxObject)
 
 #define CACHE_INCREMENT  64
 IMPLEMENT_CLASS(wxHtmlTagsCache,wxObject)
 
 #define CACHE_INCREMENT  64


@@ -57,7 +73,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
         if (src[pos] == wxT('<'))   // tag found:
            {
             if (m_CacheSize % CACHE_INCREMENT == 0)
         if (src[pos] == wxT('<'))   // tag found:
            {
             if (m_CacheSize % CACHE_INCREMENT == 0)

-                m_Cache = (sCacheItem*) realloc(m_Cache, (m_CacheSize + CACHE_INCREMENT) * sizeof(sCacheItem));
+                m_Cache = (wxHtmlCacheItem*) realloc(m_Cache, (m_CacheSize + CACHE_INCREMENT) * sizeof(wxHtmlCacheItem));

             tg = m_CacheSize++;
             m_Cache[tg].Key = stpos = pos++;
             dummy[0] = 0; i = 0;
             tg = m_CacheSize++;
             m_Cache[tg].Key = stpos = pos++;
             dummy[0] = 0; i = 0;


@@ -136,48 +152,53 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCac
     // fill-in name, params and begin pos:
     m_Name = m_Params = wxEmptyString;
     i = pos+1;
     // fill-in name, params and begin pos:
     m_Name = m_Params = wxEmptyString;
     i = pos+1;

-    if (source[i] == '/') { m_Ending = TRUE; i++; }
+    if (source[i] == wxT('/')) { m_Ending = TRUE; i++; }

     else m_Ending = FALSE;
 
     // find tag's name and convert it to uppercase:
     while ((i < end_pos) && 
     else m_Ending = FALSE;
 
     // find tag's name and convert it to uppercase:
     while ((i < end_pos) && 

-               ((c = source[i++]) != ' ' && c != '\r' && c != '\n' && c != '\t' &&
-                c != '>')) 
+               ((c = source[i++]) != wxT(' ') && c != wxT('\r') && 
+                 c != wxT('\n') && c != wxT('\t') &&
+                 c != wxT('>'))) 

        {
        {

-        if ((c >= 'a') && (c <= 'z')) c -= ('a' - 'A');
+        if ((c >= wxT('a')) && (c <= wxT('z'))) c -= (wxT('a') - wxT('A'));

         m_Name += c;
     }
 
     // if the tag has parameters, read them and "normalize" them,
     // i.e. convert to uppercase, replace whitespaces by spaces and 
     // remove whitespaces around '=':
         m_Name += c;
     }
 
     // if the tag has parameters, read them and "normalize" them,
     // i.e. convert to uppercase, replace whitespaces by spaces and 
     // remove whitespaces around '=':

-    if (source[i-1] != '>')
-        while ((i < end_pos) && ((c = source[i++]) != '>')) 
+    if (source[i-1] != wxT('>'))
+        while ((i < end_pos) && ((c = source[i++]) != wxT('>'))) 

            {
            {

-            if ((c >= 'a') && (c <= 'z')) c -= ('a' - 'A');
-            if (c == '\r' || c == '\n' || c == '\t') c = ' '; // make future parsing a bit simpler
+            if ((c >= wxT('a')) && (c <= wxT('z'))) 
+                c -= (wxT('a') - wxT('A'));
+            if (c == wxT('\r') || c == wxT('\n') || c == wxT('\t')) 
+                c = wxT(' '); // make future parsing a bit simpler

             m_Params += c;
             m_Params += c;

-            if (c == '"') 
+            if (c == wxT('"')) 

                {
                 // remove spaces around the '=' character:
                 if (m_Params.Length() > 1 && 
                {
                 // remove spaces around the '=' character:
                 if (m_Params.Length() > 1 && 

-                    m_Params[m_Params.Length()-2] == ' ')
+                    m_Params[m_Params.Length()-2] == wxT(' '))

                 {
                     m_Params.RemoveLast();
                 {
                     m_Params.RemoveLast();

-                    while (m_Params.Length() > 0 && m_Params.Last() == ' ') 
+                    while (m_Params.Length() > 0 && m_Params.Last() == wxT(' ')) 

                         m_Params.RemoveLast();
                         m_Params.RemoveLast();

-                    m_Params += '"';
+                    m_Params += wxT('"');

                 }
                 }

-                while ((i < end_pos) && (source[i++] == ' ')) {}
+                while ((i < end_pos) && (source[i++] == wxT(' '))) {}

                 if (i < end_pos) i--;
             
                 // ...and copy the value to m_Params:
                 if (i < end_pos) i--;
             
                 // ...and copy the value to m_Params:

-                while ((i < end_pos) && ((c = source[i++]) != '"')) m_Params += c;
+                while ((i < end_pos) && ((c = source[i++]) != wxT('"'))) 
+                    m_Params += c;

                 m_Params += c;
             }
                 m_Params += c;
             }

-            else if (c == '\'') 
+            else if (c == wxT('\'')) 

                {
                {

-                while ((i < end_pos) && ((c = source[i++]) != '\'')) m_Params += c;
+                while ((i < end_pos) && ((c = source[i++]) != wxT('\''))) 
+                    m_Params += c;

                 m_Params += c;
             }
         }
                 m_Params += c;
             }
         }


@@ -194,6 +215,7 @@ bool wxHtmlTag::HasParam(const wxString& par) const
 {
     const wxChar *st = m_Params, *p = par;
     const wxChar *st2, *p2;
 {
     const wxChar *st = m_Params, *p = par;
     const wxChar *st2, *p2;

+    const wxChar invalid = wxT('\1');

 
     if (*st == 0) return FALSE;
     if (*p == 0) return FALSE;
 
     if (*st == 0) return FALSE;
     if (*p == 0) return FALSE;


@@ -201,18 +223,18 @@ bool wxHtmlTag::HasParam(const wxString& par) const
     {
         if (*p2 == 0) return TRUE;
         if (*st2 == 0) return FALSE;
     {
         if (*p2 == 0) return TRUE;
         if (*st2 == 0) return FALSE;

-        if (*p2 != *st2) p2 = p;
+        if (*p2 != *st2) p2 = &invalid;

         if (*p2 == *st2) p2++;
         if (*p2 == *st2) p2++;

-        if (*st2 == ' ') p2 = p;
-        else if (*st2 == '=') 
+        if (*st2 == wxT(' ')) p2 = p;
+        else if (*st2 == wxT('=')) 

            {
             p2 = p;
            {
             p2 = p;

-            while (*st2 != ' ') 
+            while (*st2 != wxT(' ')) 

                {
                {

-                if (*st2 == '"') 
+                if (*st2 == wxT('"')) 

                        {
                     st2++;
                        {
                     st2++;

-                    while (*st2 != '"') st2++;
+                    while (*st2 != wxT('"')) st2++;

                 }
                 st2++;
                 if (*st2 == 0) return FALSE;
                 }
                 st2++;
                 if (*st2 == 0) return FALSE;


@@ -227,59 +249,60 @@ wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const
 {
     const wxChar *st = m_Params, *p = par;
     const wxChar *st2, *p2;
 {
     const wxChar *st = m_Params, *p = par;
     const wxChar *st2, *p2;

+    const wxChar invalid = wxT('\1');

     bool comma;
     bool comma;

-    char comma_char;
+    wxChar comma_char;

 
 

-    if (*st == 0) return "";
-    if (*p == 0) return "";
+    if (*st == 0) return wxEmptyString;
+    if (*p == 0) return wxEmptyString;

     for (st2 = st, p2 = p; ; st2++) 
     {
         if (*p2 == 0)  // found
            {
     for (st2 = st, p2 = p; ; st2++) 
     {
         if (*p2 == 0)  // found
            {

-            wxString fnd = "";
+            wxString fnd = wxEmptyString;

             st2++; // '=' character
             comma = FALSE;
             st2++; // '=' character
             comma = FALSE;

-           comma_char = '\0';
-            if (!with_commas && (*(st2) == '"')) 
+           comma_char = wxT('\0');
+            if (!with_commas && (*(st2) == wxT('"'))) 

                {
                st2++;
                        comma = TRUE; 
                {
                st2++;
                        comma = TRUE; 

-                       comma_char = '"';
+                       comma_char = wxT('"');

                }
                }

-           else if (!with_commas && (*(st2) == '\'')) 
+           else if (!with_commas && (*(st2) == wxT('\''))) 

                {
                st2++; 
                comma = TRUE;
                {
                st2++; 
                comma = TRUE;

-                       comma_char = '\'';
+                       comma_char = wxT('\'');

            }
            
             while (*st2 != 0) 
                {
                 if (comma && *st2 == comma_char) comma = FALSE;
            }
            
             while (*st2 != 0) 
                {
                 if (comma && *st2 == comma_char) comma = FALSE;

-                else if ((*st2 == ' ') && (!comma)) break;
+                else if ((*st2 == wxT(' ')) && (!comma)) break;

                 fnd += (*(st2++));
             }
             if (!with_commas && (*(st2-1) == comma_char)) fnd.RemoveLast();
             return fnd;
         }
                 fnd += (*(st2++));
             }
             if (!with_commas && (*(st2-1) == comma_char)) fnd.RemoveLast();
             return fnd;
         }

-        if (*st2 == 0) return "";
-        if (*p2 != *st2) p2 = p;
+        if (*st2 == 0) return wxEmptyString;
+        if (*p2 != *st2) p2 = &invalid;

         if (*p2 == *st2) p2++;
         if (*p2 == *st2) p2++;

-        if (*st2 == ' ') p2 = p;
-        else if (*st2 == '=') 
+        if (*st2 == wxT(' ')) p2 = p;
+        else if (*st2 == wxT('=')) 

            {
             p2 = p;
            {
             p2 = p;

-            while (*st2 != ' ') 
+            while (*st2 != wxT(' ')) 

                {
                {

-                if (*st2 == '"') 
+                if (*st2 == wxT('"')) 

                        {
                     st2++;
                        {
                     st2++;

-                    while (*st2 != '"') st2++;
+                    while (*st2 != wxT('"')) st2++;

                 }
                 }

-                else if (*st2 == '\'') 
+                else if (*st2 == wxT('\''))

                        {
                     st2++;
                        {
                     st2++;

-                    while (*st2 != '\'') st2++;
+                    while (*st2 != wxT('\'')) st2++;

                 }
                 st2++;
             }
                 }
                 st2++;
             }


@@ -292,7 +315,7 @@ wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const
 int wxHtmlTag::ScanParam(const wxString& par, wxChar *format, void *param) const
 {
     wxString parval = GetParam(par);
 int wxHtmlTag::ScanParam(const wxString& par, wxChar *format, void *param) const
 {
     wxString parval = GetParam(par);

-    return wxSscanf((const wxChar*)parval, format, param);
+    return wxSscanf(parval, format, param);

 }
 
 #endif
 }
 
 #endif