fixed bug in wxDateTime::Set(jdn) when DST was in effect

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

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 043bc266a0dcc8725fb166562f7c07293f03e710..3e9d05db2c515ece44e6d9b5428e728058713b6c 100644 (file)
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -4,10 +4,10 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 


@@ -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
 


@@ -32,16 +32,16 @@
 FORCE_LINK_ME(m_pre)
 
 // replaces '\t', ' ' and '\n' with HTML markup:
 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;
 {
     wxString out;

-    size_t i = 0, len = str.Len();
-    for (i = 0; i < len; i++)
+    size_t len = str.Len();
+    for (size_t i = 0; i < len; i++)

     {
         switch (str[i])
         {
             case wxT('<'):
     {
         switch (str[i])
         {
             case wxT('<'):

-                while (i < len && str[i] != wxT('>')) 
+                while (i < len && str[i] != wxT('>'))

                     out << str[i++];
                 out << wxT('>');
                 break;
                     out << str[i++];
                 out << wxT('>');
                 break;


@@ -52,7 +52,10 @@ static wxString HtmlizeWhitespaces(const wxString& str)
                 out << wxT("<br>");
                 break;
             case wxT('\t'):
                 out << wxT("<br>");
                 break;
             case wxT('\t'):

-                for (size_t j = 8 - i%8; j > 0; j--) out << wxT("&nbsp;");
+                {
+                    for (size_t j = 8 - i%8; j > 0; j--)
+                        out << wxT("&nbsp;");
+                }

                 break;
             default:
                 out << str[i];
                 break;
             default:
                 out << str[i];


@@ -69,6 +72,7 @@ static wxString HtmlizeWhitespaces(const wxString& str)
 
 
 TAG_HANDLER_BEGIN(PRE, "PRE")
 
 
 TAG_HANDLER_BEGIN(PRE, "PRE")

+    TAG_HANDLER_CONSTR(PRE) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -90,9 +94,12 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
 
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
 
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();

+        c->SetWidthFloat(tag);
+        c = m_WParser->OpenContainer();

         c->SetAlignHor(wxHTML_ALIGN_LEFT);
         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,
             m_WParser->GetSource()->Mid(tag.GetBeginPos(),
                                         tag.GetEndPos1() - tag.GetBeginPos());
         // It is safe to temporarily change the source being parsed,


@@ -101,6 +108,7 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
         m_Parser->DoParsing();
         m_Parser->RestoreState();
 
         m_Parser->DoParsing();
         m_Parser->RestoreState();
 

+        m_WParser->CloseContainer();

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