From: Julian Smart Date: Mon, 25 Jun 2012 08:02:32 +0000 (+0000) Subject: Fix for page break problem: fixes #14429 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e58471c77f2f1582f4f31408006b88527dc46b49 Fix for page break problem: fixes #14429 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/richtext/richtextprint.cpp b/src/richtext/richtextprint.cpp index a3c8d11522..59c331d02f 100644 --- a/src/richtext/richtextprint.cpp +++ b/src/richtext/richtextprint.cpp @@ -105,16 +105,16 @@ void wxRichTextPrintout::OnPreparePrinting() { // New page starting at this line int newY = rect.y; - + // We increase the offset by the difference between new and old positions - + int increaseOffsetBy = lineY - newY; yOffset += increaseOffsetBy; - + m_pageBreaksStart.Add(lastStartPos); m_pageBreaksEnd.Add(lastLine->GetAbsoluteRange().GetEnd()); m_pageYOffsets.Add(yOffset); - + lastStartPos = line->GetAbsoluteRange().GetStart(); m_numPages ++; } @@ -146,12 +146,9 @@ void wxRichTextPrintout::OnPreparePrinting() } // Closing page break - if (m_pageBreaksStart.GetCount() == 0 || (m_pageBreaksEnd[m_pageBreaksEnd.GetCount()-1] < (GetRichTextBuffer()->GetOwnRange().GetEnd()-1))) - { - m_pageBreaksStart.Add(lastStartPos); - m_pageBreaksEnd.Add(GetRichTextBuffer()->GetOwnRange().GetEnd()); - m_pageYOffsets.Add(yOffset); - } + m_pageBreaksStart.Add(lastStartPos); + m_pageBreaksEnd.Add(GetRichTextBuffer()->GetOwnRange().GetEnd()); + m_pageYOffsets.Add(yOffset); } }