Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oops, HTML entities were parsed twice

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-09-08 22:39:06 +00:00
parent 7335c5a588
commit 88dcf47c56
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/html/winpars.cpp
View File

@@ -238,12 +238,11 @@ void wxHtmlWinParser::AddText(const wxChar* txt)
templen = 0; templen = 0;
if (m_EncConv) if (m_EncConv)
m_EncConv->Convert(temp); m_EncConv->Convert(temp);
wxString str = GetEntitiesParser()->Parse(temp); size_t len = wxStrlen(temp);
size_t len = str.Len();
for (size_t j = 0; j < len; j++) for (size_t j = 0; j < len; j++)
if (str.GetChar(j) == nbsp) if (temp[j] == nbsp)
str[j] = wxT(' '); temp[j] = wxT(' ');
c = new wxHtmlWordCell(str, *(GetDC())); c = new wxHtmlWordCell(temp, *(GetDC()));
if (m_UseLink) if (m_UseLink)
c->SetLink(m_Link); c->SetLink(m_Link);
m_Container->InsertCell(c); m_Container->InsertCell(c);
@@ -256,12 +255,11 @@ void wxHtmlWinParser::AddText(const wxChar* txt)
temp[templen] = 0; temp[templen] = 0;
if (m_EncConv) if (m_EncConv)
m_EncConv->Convert(temp); m_EncConv->Convert(temp);
wxString str = GetEntitiesParser()->Parse(temp); size_t len = wxStrlen(temp);
size_t len = str.Len();
for (size_t j = 0; j < len; j++) for (size_t j = 0; j < len; j++)
if (str.GetChar(j) == nbsp) if (temp[j] == nbsp)
str[j] = wxT(' '); temp[j] = wxT(' ');
c = new wxHtmlWordCell(str, *(GetDC())); c = new wxHtmlWordCell(temp, *(GetDC()));
if (m_UseLink) if (m_UseLink)
c->SetLink(m_Link); c->SetLink(m_Link);
m_Container->InsertCell(c); m_Container->InsertCell(c);