<pre> environment uses charset conversion as well

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 5e3a4ae9da9152523131f176c784186b1a7b0656..f4999ee76bd6f921f9e6aad62c8cb7e32a8636f5 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/encconv.h"
 
 FORCE_LINK_ME(m_pre)
 
@@ -138,8 +139,11 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
 
         {
             wxString cit;
+            wxEncodingConverter *encconv = m_WParser -> GetEncodingConverter();
             cit = m_WParser -> GetSource() -> Mid(tag.GetBeginPos(), tag.GetEndPos1() - tag.GetBeginPos());
-            c -> InsertCell(new wxHtmlPRECell(cit, *(m_WParser -> GetDC())));
+            c -> InsertCell(new wxHtmlPRECell(
+                                encconv ? encconv -> Convert(cit) : cit,
+                                *(m_WParser -> GetDC())));
         }
 
         m_WParser -> SetFontUnderlined(underlined);