Some work on tabbing and menu accels,

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

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 8f0e7bb2eaed608d22081a0603f837f001f746f2..fdeaaf4a1fab56ce02b00da38ee67ce6557da285 100644 (file)
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -13,6 +13,7 @@
 
 #include <wx/wxprec.h>
 
+#include "wx/defs.h"
 #if wxUSE_HTML
 #ifdef __BORDLANDC__
 #pragma hdrstop
@@ -69,13 +70,13 @@ wxHtmlPRECell::wxHtmlPRECell(const wxString& s, wxDC& dc) : wxHtmlCell()
     while (tokenizer.HasMoreTokens()) {
         if (i % 10 == 0) m_Text = (wxString**) realloc(m_Text, sizeof(wxString*) * (i + 10));
         tmp = tokenizer.NextToken();
-        tmp.Replace("&nbsp;", " ", TRUE);
-        tmp.Replace("&quot;", "\"", TRUE);
-        tmp.Replace("&lt;", "<", TRUE);
-        tmp.Replace("&gt;", ">", TRUE);
-        tmp.Replace("&amp;", "&", TRUE);
-        tmp.Replace("\t", "        ", TRUE);
-        tmp.Replace("\r", "", TRUE);
+        tmp.Replace(wxT("&nbsp;"), wxT(" "), TRUE);
+        tmp.Replace(wxT("&quot;"), wxT("\""), TRUE);
+        tmp.Replace(wxT("&lt;"), wxT("<"), TRUE);
+        tmp.Replace(wxT("&gt;"), wxT(">"), TRUE);
+        tmp.Replace(wxT("&amp;"), wxT("&"), TRUE);
+        tmp.Replace(wxT("\t"), wxT("        "), TRUE);
+        tmp.Replace(wxT("\r"), wxT(""), TRUE);
         m_Text[i++] = new wxString(tmp);
 
         dc.GetTextExtent(tmp, &x, &z, &z);