X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/314260fbd07ecebb43c60d147e1f4580a7159e42..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/html/htmlcell.cpp?ds=sidebyside

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 84b06fddf6..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(" ", " ", TRUE);
-    m_Word.Replace(""", "\"", TRUE);
-    m_Word.Replace("&lt;", "<", TRUE);
-    m_Word.Replace("&gt;", ">", TRUE);
-    m_Word.Replace("&amp;", "&", 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);
+
+    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);
 }
@@ -381,11 +389,11 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag)
         wxString wd = tag.GetParam("WIDTH");
 
         if (wd[wd.Length()-1] == '%') {
-            sscanf(wd.c_str(), "%i%%", &wdi);
+            wxSscanf(wd.c_str(), wxT("%i%%"), &wdi);
             SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);
         }
         else {
-            sscanf(wd.c_str(), "%i", &wdi);
+            wxSscanf(wd.c_str(), wxT("%i"), &wdi);
             SetWidthFloat(wdi, wxHTML_UNITS_PIXELS);
         }
     }