#include <wx/wxprec.h>
+#include "wx/defs.h"
#if wxUSE_HTML
#ifdef __BORDLANDC__
#pragma hdrstop
while (tokenizer.HasMoreTokens()) {
if (i % 10 == 0) m_Text = (wxString**) realloc(m_Text, sizeof(wxString*) * (i + 10));
tmp = tokenizer.NextToken();
- tmp.Replace(" ", " ", TRUE);
- tmp.Replace(""", "\"", TRUE);
- tmp.Replace("<", "<", TRUE);
- tmp.Replace(">", ">", TRUE);
- tmp.Replace("&", "&", TRUE);
- tmp.Replace("\t", " ", TRUE);
- tmp.Replace("\r", "", TRUE);
+ tmp.Replace(wxT(" "), wxT(" "), TRUE);
+ tmp.Replace(wxT("""), wxT("\""), TRUE);
+ tmp.Replace(wxT("<"), wxT("<"), TRUE);
+ tmp.Replace(wxT(">"), wxT(">"), TRUE);
+ tmp.Replace(wxT("&"), 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);
m_WParser -> CloseContainer();
c = m_WParser -> OpenContainer();
- c -> SetAlignHor(HTML_ALIGN_LEFT);
- c -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_VERTICAL);
+ c -> SetAlignHor(wxHTML_ALIGN_LEFT);
+ c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_VERTICAL);
m_WParser -> SetFontUnderlined(FALSE);
m_WParser -> SetFontBold(FALSE);