Oops, compile errors...

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

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 61cafb7b7b90062c2a9b5ad1ca16efdcf8fb7885..b7f283a2245d0cd115cda89ece2cf232d136c3e9 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$
@@ -29,8 +29,9 @@
 
 #include "wx/html/htmlcell.h"
 #include "wx/tokenzr.h"
+#include "wx/encconv.h"
 
-FORCE_LINK_ME(mod_pre)
+FORCE_LINK_ME(m_pre)
 
 
 //-----------------------------------------------------------------------------
@@ -70,6 +71,7 @@ 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(wxT("&copy;"), wxT("(c)"), TRUE);
         tmp.Replace(wxT("&nbsp;"), wxT(" "), TRUE);
         tmp.Replace(wxT("&quot;"), wxT("\""), TRUE);
         tmp.Replace(wxT("&lt;"), wxT("<"), TRUE);
@@ -132,13 +134,20 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
         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()));
 
         {
             wxString cit;
-            cit = m_WParser -> GetSource() -> Mid(tag.GetBeginPos(), tag.GetEndPos1() - tag.GetBeginPos());
-            c -> InsertCell(new wxHtmlPRECell(cit, *(m_WParser -> GetDC())));
+            wxEncodingConverter *encconv = m_WParser -> GetEncodingConverter();
+            cit = m_WParser -> GetSource() -> Mid(tag.GetBeginPos(), 
+                                       tag.GetEndPos1() - tag.GetBeginPos());
+            if (encconv)
+                c -> InsertCell(new wxHtmlPRECell(encconv -> Convert(cit), 
+                                                  *(m_WParser -> GetDC())));
+            else
+                c -> InsertCell(new wxHtmlPRECell(cit, 
+                                                  *(m_WParser -> GetDC())));
         }
 
         m_WParser -> SetFontUnderlined(underlined);