TIFF fix.

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

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 8412ee06eda7f9f5d8828793693d3ac0bed109fb..5e3a4ae9da9152523131f176c784186b1a7b0656 100644 (file)
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mod_pre.cpp
+// Name:        m_pre.cpp
 // Purpose:     wxHtml module for <PRE> ... </PRE> tag (code citation)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -11,15 +11,16 @@
 #pragma implementation
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
+#include "wx/defs.h"
 #if wxUSE_HTML
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
 
@@ -27,9 +28,9 @@
 #include "wx/html/m_templ.h"
 
 #include "wx/html/htmlcell.h"
-#include <wx/tokenzr.h>
+#include "wx/tokenzr.h"
 
-FORCE_LINK_ME(mod_pre)
+FORCE_LINK_ME(m_pre)
 
 
 //-----------------------------------------------------------------------------
@@ -69,13 +70,14 @@ 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("&copy;"), wxT("(c)"), 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);
@@ -124,14 +126,14 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
 
         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);
         m_WParser -> SetFontItalic(FALSE);
         m_WParser -> SetFontFixed(TRUE);
-        m_WParser -> SetFontSize(0);
+        m_WParser -> SetFontSize(3);
         c -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
 
         {