X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..b71e9aa4e2187a7f6469f68812467f2ecb6a3836:/src/html/m_pre.cpp?ds=sidebyside

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 27fa27a31a..f522512994 100644
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -4,13 +4,9 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
@@ -35,27 +31,39 @@ FORCE_LINK_ME(m_pre)
 static wxString LINKAGEMODE HtmlizeWhitespaces(const wxString& str)
 {
     wxString out;
-    size_t i = 0, j = 0, len = str.Len();
-    for (i = 0; i < len; i++)
+    size_t len = str.Len();
+    size_t linepos = 0;
+    for (size_t i = 0; i < len; i++)
     {
         switch (str[i])
         {
             case wxT('<'):
                 while (i < len && str[i] != wxT('>'))
+                {
                     out << str[i++];
+                    linepos++;
+                }
                 out << wxT('>');
+                linepos++;
                 break;
             case wxT(' '):
                 out << wxT("&nbsp;");
+                linepos++;
                 break;
             case wxT('\n'):
                 out << wxT("<br>");
+                linepos = 0;
                 break;
             case wxT('\t'):
-                for (j = 8 - i%8; j > 0; j--) out << wxT("&nbsp;");
+                {
+                    for (size_t j = 8 - linepos % 8; j > 0; j--)
+                        out << wxT("&nbsp;");
+                    linepos += 8 - linepos % 8;
+                }
                 break;
             default:
                 out << str[i];
+                linepos++;
                 break;
         }
     }
@@ -82,15 +90,17 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
             fsize = m_WParser->GetFontSize();
 
         c = m_WParser->GetContainer();
-        m_WParser->SetFontUnderlined(FALSE);
-        m_WParser->SetFontBold(FALSE);
-        m_WParser->SetFontItalic(FALSE);
-        m_WParser->SetFontFixed(TRUE);
+        m_WParser->SetFontUnderlined(false);
+        m_WParser->SetFontBold(false);
+        m_WParser->SetFontItalic(false);
+        m_WParser->SetFontFixed(true);
         m_WParser->SetFontSize(3);
         c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
+        c->SetWidthFloat(tag);
+        c = m_WParser->OpenContainer();
         c->SetAlignHor(wxHTML_ALIGN_LEFT);
         c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
 
@@ -103,6 +113,7 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
         m_Parser->DoParsing();
         m_Parser->RestoreState();
 
+        m_WParser->CloseContainer();
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
 
@@ -113,7 +124,7 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
         m_WParser->SetFontSize(fsize);
         c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 
-        return TRUE;
+        return true;
     }
 
 TAG_HANDLER_END(PRE)