fixed HTML parsing in regard to spaces between tags

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index fc5ddff8153634f12edaadc755411a5117b42b5b..bf62ed1893a45f903d5382baf8a992c26ae35347 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -234,6 +234,7 @@ 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);


@@ -249,7 +250,8 @@ void wxHtmlWinParser::AddText(const wxChar* txt)
             m_tmpLastWasSpace = TRUE;
         }
     }
             m_tmpLastWasSpace = TRUE;
         }
     }

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

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