VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 6979805f45fd302dc65e6dc5dad703716a108a75..b9139ae9e820ca012a9c1fc414aa0017e1c8d4e1 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -13,6 +13,7 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#include "wx/defs.h"

 #if wxUSE_HTML
 
 #ifdef __BORDLANDC__
 #if wxUSE_HTML
 
 #ifdef __BORDLANDC__


@@ -72,11 +73,19 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak)
 wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 {
     m_Word = word;
 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);
 }
     dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);
     SetCanLiveOnPagebreak(FALSE);
 }


@@ -380,11 +389,11 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag)
         wxString wd = tag.GetParam("WIDTH");
 
         if (wd[wd.Length()-1] == '%') {
         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 {
             SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);
         }
         else {

-            sscanf(wd.c_str(), "%i", &wdi);
+            wxSscanf(wd.c_str(), wxT("%i"), &wdi);

             SetWidthFloat(wdi, wxHTML_UNITS_PIXELS);
         }
     }
             SetWidthFloat(wdi, wxHTML_UNITS_PIXELS);
         }
     }