Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index cbd2a5a0d55bd5ac7eea832e719a4a8070f89011..9d17c87eabe540d825cb8d8162ecdd6ffd61418d 100644 (file)
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -60,7 +60,7 @@ IMPLEMENT_CLASS(wxHtmlTagsCache,wxObject)
 wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
 {
     const wxChar *src = source.c_str();
-    int i, tg, pos, stpos;
+    int tg, stpos;
     int lng = source.Length();
     wxChar tagBuffer[256];
 
@@ -68,7 +68,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
     m_CacheSize = 0;
     m_CachePos = 0;
 
-    pos = 0;
+    int pos = 0;
     while (pos < lng)
     {
         if (src[pos] == wxT('<'))   // tag found:
@@ -78,8 +78,9 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
             tg = m_CacheSize++;
             m_Cache[tg].Key = stpos = pos++;
 
+            int i;
             for ( i = 0;
-                  pos < lng && i < WXSIZEOF(tagBuffer) - 1 &&
+                  pos < lng && i < (int)WXSIZEOF(tagBuffer) - 1 &&
                   src[pos] != wxT('>') && !wxIsspace(src[pos]);
                   i++, pos++ )
             {
@@ -114,7 +115,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
     }
 
     // ok, we're done, now we'll free .Name members of cache - we don't need it anymore:
-    for (i = 0; i < m_CacheSize; i++)
+    for (int i = 0; i < m_CacheSize; i++)
     {
         delete[] m_Cache[i].Name;
         m_Cache[i].Name = NULL;