X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83c9da455abe6143dee521104d4ca08b26996702..cc9a39576ab6edb139c9bb77d01f4118853e04d2:/src/html/m_pre.cpp?ds=inline diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp index 043bc266a0..9d84e28fa5 100644 --- 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 -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation #endif @@ -15,7 +15,7 @@ #include "wx/defs.h" #if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -32,30 +32,42 @@ 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(); - 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('>')) + while (i < len && str[i] != wxT('>')) + { out << str[i++]; + linepos++; + } out << wxT('>'); + linepos++; break; case wxT(' '): out << wxT(" "); + linepos++; break; case wxT('\n'): out << wxT("
"); + linepos = 0; break; case wxT('\t'): - for (size_t j = 8 - i%8; j > 0; j--) out << wxT(" "); + { + for (size_t j = 8 - linepos % 8; j > 0; j--) + out << wxT(" "); + linepos += 8 - linepos % 8; + } break; default: out << str[i]; + linepos++; break; } } @@ -69,6 +81,7 @@ static wxString HtmlizeWhitespaces(const wxString& str) TAG_HANDLER_BEGIN(PRE, "PRE") + TAG_HANDLER_CONSTR(PRE) { } TAG_HANDLER_PROC(tag) { @@ -81,18 +94,21 @@ 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); - wxString srcMid = + wxString srcMid = m_WParser->GetSource()->Mid(tag.GetBeginPos(), tag.GetEndPos1() - tag.GetBeginPos()); // It is safe to temporarily change the source being parsed, @@ -101,6 +117,7 @@ TAG_HANDLER_BEGIN(PRE, "PRE") m_Parser->DoParsing(); m_Parser->RestoreState(); + m_WParser->CloseContainer(); m_WParser->CloseContainer(); c = m_WParser->OpenContainer(); @@ -111,7 +128,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)