ignore bakefile-generated test.dsw too

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index b01fad245a8522f1982ab538a34e612f3dbe06f0..1769f56c264b6639e0fe9d150e910d30db1dcb51 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -199,10 +199,13 @@ void wxHtmlWinParser::InitParser(const wxString& source)
     m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
     m_FontSize = 3; //default one
     CreateCurrentFont();           // we're selecting default font into
     m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
     m_FontSize = 3; //default one
     CreateCurrentFont();           // we're selecting default font into

-    m_DC->GetTextExtent( wxT("H"), &m_CharWidth, &m_CharHeight);
-                /* NOTE : we're not using GetCharWidth/Height() because
-                   of differences under X and win
-                 */
+    
+    // we're not using GetCharWidth/Height() because of
+    // differences under X and win
+    wxCoord w,h;
+    m_DC->GetTextExtent( wxT("H"), &w, &h);
+    m_CharWidth = w;
+    m_CharHeight = h;

 
     m_UseLink = false;
     m_Link = wxHtmlLinkInfo( wxEmptyString );
 
     m_UseLink = false;
     m_Link = wxHtmlLinkInfo( wxEmptyString );


@@ -339,15 +342,13 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
     return GetFS()->OpenFile(myurl, flags);
 }
 
     return GetFS()->OpenFile(myurl, flags);
 }
 

-void wxHtmlWinParser::AddText(const wxChar* txt)
+void wxHtmlWinParser::AddText(const wxString& txt)

 {
 {

-    size_t i = 0,
-           x,
-           lng = wxStrlen(txt);

     register wxChar d;
     int templen = 0;
     wxChar nbsp = GetEntitiesParser()->GetCharForCode(160 /* nbsp */);
 
     register wxChar d;
     int templen = 0;
     wxChar nbsp = GetEntitiesParser()->GetCharForCode(160 /* nbsp */);
 

+    size_t lng = txt.length();

     if (lng+1 > m_tmpStrBufSize)
     {
         delete[] m_tmpStrBuf;
     if (lng+1 > m_tmpStrBufSize)
     {
         delete[] m_tmpStrBuf;


@@ -356,24 +357,36 @@ void wxHtmlWinParser::AddText(const wxChar* txt)
     }
     wxChar *temp = m_tmpStrBuf;
 
     }
     wxChar *temp = m_tmpStrBuf;
 

+    wxString::const_iterator i = txt.begin();
+    wxString::const_iterator end = txt.end();
+

     if (m_tmpLastWasSpace)
     {
     if (m_tmpLastWasSpace)
     {

-        while ((i < lng) &&
-               ((txt[i] == wxT('\n')) || (txt[i] == wxT('\r')) || (txt[i] == wxT(' ')) ||
-                (txt[i] == wxT('\t')))) i++;
+        while ( (i < end) &&
+                (*i == wxT('\n') || *i == wxT('\r') || *i == wxT(' ') ||
+                 *i == wxT('\t')) )
+        {
+            ++i;
+        }

     }
 
     }
 

-    while (i < lng)
+    while (i < end)

     {
     {

-        x = 0;
-        d = temp[templen++] = txt[i];
+        size_t x = 0;
+        d = temp[templen++] = *i;

         if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
         {
         if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
         {

-            i++, x++;
-            while ((i < lng) && ((txt[i] == wxT('\n')) || (txt[i] == wxT('\r')) ||
-                                 (txt[i] == wxT(' ')) || (txt[i] == wxT('\t')))) i++, x++;
+            ++i, ++x;
+            while ( (i < end) &&
+                    (*i == wxT('\n') || *i == wxT('\r') ||
+                     *i == wxT(' ') || *i == wxT('\t')) )
+            {
+                ++i;
+                ++x;
+            }

         }
         }

-        else i++;
+        else
+            ++i;

 
         if (x)
         {
 
         if (x)
         {