use wxFileName::MakeAbsolute istead of Normalize

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

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index e09dda36551691e47e062896de609f34391c383e..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
 


@@ -32,7 +32,7 @@
 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;
     size_t i = 0, j = 0, len = str.Len();
 {
     wxString out;
     size_t i = 0, j = 0, len = str.Len();


@@ -91,6 +91,7 @@ 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 srcMid =
             m_WParser->GetSource()->Mid(tag.GetBeginPos(),
 
         wxString srcMid =
             m_WParser->GetSource()->Mid(tag.GetBeginPos(),