Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change wxRichTextParagraph::m_cachedLines data type to vector

Browse Source 
Now wxRichTextParagraph::m_cachedLines is stored as a wxVector instead
of a wxList.

See #2523, closes #2577.
This commit is contained in:
Mehmet Soyturk
2021-11-02 10:15:13 +03:00
committed by Vadim Zeitlin
parent 151a9c5a63
commit 8aa5c55f61
5 changed files with 93 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/richtext/richtextprint.cpp
View File

@@ -80,13 +80,13 @@ void wxRichTextPrintout::OnPreparePrinting()
wxASSERT (child != NULL);
if (child)
{
wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
while (node2)
wxRichTextLineVector::const_iterator it = child->GetLines().begin();
while (it != child->GetLines().end())
{
wxRichTextLine* line = node2->GetData();
wxRichTextLine* line = *it;
int lineY = child->GetPosition().y + line->GetPosition().y - yOffset;
bool hasHardPageBreak = ((node2 == child->GetLines().GetFirst()) && child->GetAttributes().HasPageBreak());
bool hasHardPageBreak = ((it == child->GetLines().begin()) && child->GetAttributes().HasPageBreak());
// Break the page if either we're going off the bottom, or this paragraph specifies
// an explicit page break
@@ -134,7 +134,7 @@ void wxRichTextPrintout::OnPreparePrinting()
lastLine = line;
node2 = node2->GetNext();
++it;
}
}