X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1309ba6c7ec76b4507cf1f2e8656749e3de1befa..aba4387c4c71fb812c6a07a7abb495606c5ef4af:/src/html/m_pre.cpp diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp index a474a1ec38..e6e26c6c85 100644 --- a/src/html/m_pre.cpp +++ b/src/html/m_pre.cpp @@ -20,10 +20,8 @@ #endif #ifndef WXPRECOMP -#include "wx/wx.h" #endif - #include "wx/html/forcelnk.h" #include "wx/html/m_templ.h" @@ -62,21 +60,19 @@ TAG_HANDLER_BEGIN(PRE, "PRE") c = m_WParser->OpenContainer(); c->SetAlignHor(wxHTML_ALIGN_LEFT); - wxString src, srcMid; - - src = *m_WParser->GetSource(); - srcMid = src.Mid(tag.GetBeginPos(), - tag.GetEndPos1() - tag.GetBeginPos()); + wxString srcMid = + m_WParser->GetSource()->Mid(tag.GetBeginPos(), + tag.GetEndPos1() - tag.GetBeginPos()); srcMid.Replace(wxT("\t"), wxT(" ")); srcMid.Replace(wxT(" "), wxT(" ")); srcMid.Replace(wxT("\n"), wxT("
")); // It is safe to temporarily change the source being parsed, // provided we restore the state back after parsing - m_Parser->SetSource(srcMid); + m_Parser->SetSourceAndSaveState(srcMid); m_Parser->DoParsing(); - m_Parser->SetSource(src); - + m_Parser->RestoreState(); + m_WParser->CloseContainer(); c = m_WParser->OpenContainer();