large files support for wxFFile (patch 1077980 from Mike Wetherell)

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

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index 16579f607fe691d8c84269fc2bbc845caa1562bc..1b9b7bd784006de5e7bc9337c34b547afdd5af39 100644 (file)
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -90,7 +90,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
                   src[pos] != wxT('>') && !wxIsspace(src[pos]);
                   i++, pos++ )
             {
-                tagBuffer[i] = wxToupper(src[pos]);
+                tagBuffer[i] = (wxChar)wxToupper(src[pos]);
             }
             tagBuffer[i] = _T('\0');
 
@@ -127,7 +127,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
                             ++pos;
                         if (src[pos] == '<')
                             ++pos;
-                        
+
                         // see if it matches
                         int match_pos = 0;
                         while (pos < lng && match_pos < tag_len && src[pos] != '>' && src[pos] != '<') {
@@ -135,7 +135,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
                             // Unicode build
                             if ((wxChar)wxToupper(src[pos]) == tagBuffer[match_pos]) {
                                 ++match_pos;
-                            }  
+                            }
                             else if (src[pos] == wxT(' ') || src[pos] == wxT('\n') ||
                                 src[pos] == wxT('\r') || src[pos] == wxT('\t')) {
                                 // need to skip over these
@@ -149,7 +149,6 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
                         // found a match
                         if (match_pos == tag_len) {
                             pos = pos - tag_len - 3;
-                            stpos = pos;
                             break;
                         }
                         else {
@@ -362,12 +361,12 @@ wxHtmlTag::~wxHtmlTag()
 
 bool wxHtmlTag::HasParam(const wxString& par) const
 {
-    return (m_ParamNames.Index(par, FALSE) != wxNOT_FOUND);
+    return (m_ParamNames.Index(par, false) != wxNOT_FOUND);
 }
 
 wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const
 {
-    int index = m_ParamNames.Index(par, FALSE);
+    int index = m_ParamNames.Index(par, false);
     if (index == wxNOT_FOUND)
         return wxEmptyString;
     if (with_commas)
@@ -393,23 +392,23 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
 {
     wxString str = GetParam(par);
 
-    if (str.IsEmpty()) return FALSE;
+    if (str.IsEmpty()) return false;
     if (str.GetChar(0) == wxT('#'))
     {
         unsigned long tmp;
         if (ScanParam(par, wxT("#%lX"), &tmp) != 1)
-            return FALSE;
+            return false;
         *clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16),
-                                           (unsigned char)((tmp & 0x00FF00) >> 8),
-                                           (unsigned char)(tmp & 0x0000FF));
-        return TRUE;
+                        (unsigned char)((tmp & 0x00FF00) >> 8),
+                        (unsigned char)(tmp & 0x0000FF));
+        return true;
     }
     else
     {
         // Handle colours defined in HTML 4.0:
         #define HTML_COLOUR(name,r,g,b)                 \
-            if (str.IsSameAs(wxT(name), FALSE))         \
-                { *clr = wxColour(r,g,b); return TRUE; }
+            if (str.IsSameAs(wxT(name), false))         \
+                { *clr = wxColour(r,g,b); return true; }
         HTML_COLOUR("black",   0x00,0x00,0x00)
         HTML_COLOUR("silver",  0xC0,0xC0,0xC0)
         HTML_COLOUR("gray",    0x80,0x80,0x80)
@@ -429,12 +428,12 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
         #undef HTML_COLOUR
     }
 
-    return FALSE;
+    return false;
 }
 
 bool wxHtmlTag::GetParamAsInt(const wxString& par, int *clr) const
 {
-    if (!HasParam(par)) return FALSE;
+    if (!HasParam(par)) return false;
     long i;
     bool succ = GetParam(par).ToLong(&i);
     *clr = (int)i;