X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83c9da455abe6143dee521104d4ca08b26996702..836915e177aa750ca5c3bc19b4dbdedd36603e8d:/src/html/m_pre.cpp diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp index 043bc266a0..f1c064e755 100644 --- a/src/html/m_pre.cpp +++ b/src/html/m_pre.cpp @@ -32,16 +32,16 @@ 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(); + size_t i = 0, j = 0, len = str.Len(); for (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++]; out << wxT('>'); break; @@ -52,7 +52,7 @@ static wxString HtmlizeWhitespaces(const wxString& str) out << wxT("
"); break; case wxT('\t'): - for (size_t j = 8 - i%8; j > 0; j--) out << wxT(" "); + for (j = 8 - i%8; j > 0; j--) out << wxT(" "); break; default: out << str[i]; @@ -91,8 +91,9 @@ TAG_HANDLER_BEGIN(PRE, "PRE") m_WParser->CloseContainer(); 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,