X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cd82622a0ce80f8a5f9ffa8ee5a796a4ca4af4b..dc259b792613550edda31cc6202b42e172e2a240:/src/html/htmltag.cpp diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index cbd2a5a0d5..47ac16a2e4 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -9,7 +9,7 @@ #ifdef __GNUG__ -#pragma implementation +#pragma implementation "htmltag.h" #endif #include "wx/wxprec.h" @@ -17,7 +17,7 @@ #include "wx/defs.h" #if wxUSE_HTML -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -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;