cleaned up the waitpid() result processing mess

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index fc5ddff8153634f12edaadc755411a5117b42b5b..59b93e06928cef39670e191ea017f85d939de16a 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -234,32 +234,32 @@ void wxHtmlWinParser::AddText(const wxChar* txt)
         {
             temp[templen-1] = wxT(' ');
             temp[templen] = 0;
         {
             temp[templen-1] = wxT(' ');
             temp[templen] = 0;

+            if (templen == 1) continue;

             templen = 0;
             if (m_EncConv)
                 m_EncConv->Convert(temp);
             templen = 0;
             if (m_EncConv)
                 m_EncConv->Convert(temp);

-            wxString str = GetEntitiesParser()->Parse(temp);
-            size_t len = str.Len();
+            size_t len = wxStrlen(temp);

             for (size_t j = 0; j < len; j++)
             for (size_t j = 0; j < len; j++)

-                if (str.GetChar(j) == nbsp)
-                    str[j] = wxT(' ');
-            c = new wxHtmlWordCell(str, *(GetDC()));
+                if (temp[j] == nbsp)
+                    temp[j] = wxT(' ');
+            c = new wxHtmlWordCell(temp, *(GetDC()));

             if (m_UseLink)
                 c->SetLink(m_Link);
             m_Container->InsertCell(c);
             m_tmpLastWasSpace = TRUE;
         }
     }
             if (m_UseLink)
                 c->SetLink(m_Link);
             m_Container->InsertCell(c);
             m_tmpLastWasSpace = TRUE;
         }
     }

-    if (templen)
+
+    if (templen && (templen > 1 || temp[0] != wxT(' ')))

     {
         temp[templen] = 0;
         if (m_EncConv)
             m_EncConv->Convert(temp);
     {
         temp[templen] = 0;
         if (m_EncConv)
             m_EncConv->Convert(temp);

-        wxString str = GetEntitiesParser()->Parse(temp);
-        size_t len = str.Len();
+        size_t len = wxStrlen(temp);

         for (size_t j = 0; j < len; j++)
         for (size_t j = 0; j < len; j++)

-            if (str.GetChar(j) == nbsp)
-                str[j] = wxT(' ');
-        c = new wxHtmlWordCell(str, *(GetDC()));
+            if (temp[j] == nbsp)
+                temp[j] = wxT(' ');
+        c = new wxHtmlWordCell(temp, *(GetDC()));

         if (m_UseLink)
             c->SetLink(m_Link);
         m_Container->InsertCell(c);
         if (m_UseLink)
             c->SetLink(m_Link);
         m_Container->InsertCell(c);