check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index e09dda36551691e47e062896de609f34391c383e..5afcbbc6b75964cb1c93a3aa2bac791647a3acaf 100644 (file)
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -1,25 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        m_pre.cpp
+// Name:        src/html/m_pre.cpp

 // Purpose:     wxHtml module for <PRE> ... </PRE> tag (code citation)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     wxHtml module for <PRE> ... </PRE> tag (code citation)
 // 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/wxprec.h"
 

-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP

 #endif
 
 #include "wx/html/forcelnk.h"
 #endif
 
 #include "wx/html/forcelnk.h"


@@ -32,30 +28,42 @@
 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, 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])
+        switch ( str[i].GetValue() )

         {
             case wxT('<'):
                 while (i < len && str[i] != wxT('>'))
         {
             case wxT('<'):
                 while (i < len && str[i] != wxT('>'))

+                {

                     out << str[i++];
                     out << str[i++];

+                    linepos++;
+                }

                 out << wxT('>');
                 out << wxT('>');

+                linepos++;

                 break;
             case wxT(' '):
                 out << wxT("&nbsp;");
                 break;
             case wxT(' '):
                 out << wxT("&nbsp;");

+                linepos++;

                 break;
             case wxT('\n'):
                 out << wxT("<br>");
                 break;
             case wxT('\n'):
                 out << wxT("<br>");

+                linepos = 0;

                 break;
             case wxT('\t'):
                 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];
                 break;
             default:
                 out << str[i];

+                linepos++;

                 break;
         }
     }
                 break;
         }
     }


@@ -69,6 +77,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)
     {


@@ -81,26 +90,24 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
             fsize = m_WParser->GetFontSize();
 
         c = m_WParser->GetContainer();
             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();
         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->SetAlignHor(wxHTML_ALIGN_LEFT);

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

 
 

-        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
-        m_Parser->SetSourceAndSaveState(HtmlizeWhitespaces(srcMid));
-        m_Parser->DoParsing();
-        m_Parser->RestoreState();
+        wxString srcMid = m_WParser->GetInnerSource(tag);
+        ParseInnerSource(HtmlizeWhitespaces(srcMid));

 
 

+        m_WParser->CloseContainer();

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


@@ -111,7 +118,7 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
         m_WParser->SetFontSize(fsize);
         c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 
         m_WParser->SetFontSize(fsize);
         c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 

-        return TRUE;
+        return true;

     }
 
 TAG_HANDLER_END(PRE)
     }
 
 TAG_HANDLER_END(PRE)