1. added wxUpdateUIEvent handling to wxMGL

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

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 043bc266a0dcc8725fb166562f7c07293f03e710..f1c064e7554d424bb813100cb43a0d69f4441223 100644 (file)
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -32,16 +32,16 @@
 FORCE_LINK_ME(m_pre)
 
 // replaces '\t', ' ' and '\n' with HTML markup:
-static wxString HtmlizeWhitespaces(const wxString& str)
+static wxString LINKAGEMODE HtmlizeWhitespaces(const wxString& str)
 {
     wxString out;
-    size_t i = 0, len = str.Len();
+    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('>')) 
+                while (i < len && str[i] != wxT('>'))
                     out << str[i++];
                 out << wxT('>');
                 break;
@@ -52,7 +52,7 @@ static wxString HtmlizeWhitespaces(const wxString& str)
                 out << wxT("<br>");
                 break;
             case wxT('\t'):
-                for (size_t j = 8 - i%8; j > 0; j--) out << wxT("&nbsp;");
+                for (j = 8 - i%8; j > 0; j--) out << wxT("&nbsp;");
                 break;
             default:
                 out << str[i];
@@ -91,8 +91,9 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
         c->SetAlignHor(wxHTML_ALIGN_LEFT);
+        c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
 
-        wxString srcMid = 
+        wxString srcMid =
             m_WParser->GetSource()->Mid(tag.GetBeginPos(),
                                         tag.GetEndPos1() - tag.GetBeginPos());
         // It is safe to temporarily change the source being parsed,