1. status bar can now be positioned on top (and anywhere, in fact)

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

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 5e3a4ae9da9152523131f176c784186b1a7b0656..b7f283a2245d0cd115cda89ece2cf232d136c3e9 100644 (file)
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -29,6 +29,7 @@
 
 #include "wx/html/htmlcell.h"
 #include "wx/tokenzr.h"
 
 #include "wx/html/htmlcell.h"
 #include "wx/tokenzr.h"

+#include "wx/encconv.h"

 
 FORCE_LINK_ME(m_pre)
 
 
 FORCE_LINK_ME(m_pre)
 


@@ -138,8 +139,15 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
 
         {
             wxString cit;
 
         {
             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);
         }
 
         m_WParser -> SetFontUnderlined(underlined);