From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 3 Nov 1999 22:39:51 +0000 (+0000)
Subject: wxHTML now supports not only "&nbsp;"-like specials but "&nbsp " as well
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/12909796a5020e917b3e6403cec148717009723f?hp=c32bfc1090c21533a11daf2c293d546d45383b49

wxHTML now supports not only "&nbsp;"-like specials but "&nbsp " as well


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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 04570b4127..b9139ae9e8 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -73,11 +73,19 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak)
 wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 {
     m_Word = word;
+
     m_Word.Replace(wxT("&nbsp;"), wxT(" "), TRUE);
     m_Word.Replace(wxT("&quot;"), wxT("\""), TRUE);
     m_Word.Replace(wxT("&lt;"), wxT("<"), TRUE);
     m_Word.Replace(wxT("&gt;"), wxT(">"), TRUE);
     m_Word.Replace(wxT("&amp;"), wxT("&"), TRUE);
+
+    m_Word.Replace(wxT("&nbsp "), wxT(" "), TRUE);
+    m_Word.Replace(wxT("&quot "), wxT("\""), TRUE);
+    m_Word.Replace(wxT("&lt "), wxT("<"), TRUE);
+    m_Word.Replace(wxT("&gt "), wxT(">"), TRUE);
+    m_Word.Replace(wxT("&amp "), wxT("&"), TRUE);
+
     dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);
     SetCanLiveOnPagebreak(FALSE);
 }