don't report setlocale failure if trying to set Unicode-only language

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

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index f87983853ada3af0d784f7ff50efc79d371ef491..313d8a88bc129a09ee5a9c8aa912667a265fdb0e 100644 (file)
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -15,7 +15,7 @@
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 


@@ -31,6 +31,38 @@
 
 FORCE_LINK_ME(m_pre)
 
 
 FORCE_LINK_ME(m_pre)
 

+// replaces '\t', ' ' and '\n' with HTML markup:
+static wxString LINKAGEMODE HtmlizeWhitespaces(const wxString& str)
+{
+    wxString out;
+    size_t i = 0, j = 0, len = str.Len();
+    for (i = 0; i < len; i++)
+    {
+        switch (str[i])
+        {
+            case wxT('<'):
+                while (i < len && str[i] != wxT('>'))
+                    out << str[i++];
+                out << wxT('>');
+                break;
+            case wxT(' '):
+                out << wxT("&nbsp;");
+                break;
+            case wxT('\n'):
+                out << wxT("<br>");
+                break;
+            case wxT('\t'):
+                for (j = 8 - i%8; j > 0; j--) out << wxT("&nbsp;");
+                break;
+            default:
+                out << str[i];
+                break;
+        }
+    }
+    return out;
+}
+
+

 //-----------------------------------------------------------------------------
 // The list handler:
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // The list handler:
 //-----------------------------------------------------------------------------


@@ -59,21 +91,16 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
         c->SetAlignHor(wxHTML_ALIGN_LEFT);
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
         c->SetAlignHor(wxHTML_ALIGN_LEFT);

+        c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);

 
 

-        wxString src, srcMid;
-
-        src = *m_WParser->GetSource();
-        srcMid = src.Mid(tag.GetBeginPos(),
-                         tag.GetEndPos1() - tag.GetBeginPos());
-        srcMid.Replace(wxT("\t"), wxT("        "));
-        srcMid.Replace(wxT(" "), wxT("&nbsp;"));
-        srcMid.Replace(wxT("\n"), wxT("<br>"));
-
+        wxString srcMid =
+            m_WParser->GetSource()->Mid(tag.GetBeginPos(),
+                                        tag.GetEndPos1() - tag.GetBeginPos());

         // It is safe to temporarily change the source being parsed,
         // provided we restore the state back after parsing
         // It is safe to temporarily change the source being parsed,
         // provided we restore the state back after parsing

-        m_Parser->SetSource(srcMid);
+        m_Parser->SetSourceAndSaveState(HtmlizeWhitespaces(srcMid));

         m_Parser->DoParsing();
         m_Parser->DoParsing();

-        m_Parser->SetSource(src);
+        m_Parser->RestoreState();

 
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
 
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();