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

Pagination fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2006-10-27 14:32:55 +00:00
parent a793401243
commit 46e7a90e47
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/richtext/richtextbuffer.cpp
View File

@ -531,7 +531,7 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range,
// Skip // Skip
} }
else else
child->Draw(dc, child->GetRange(), selectionRange, childRect, descent, style); child->Draw(dc, range, selectionRange, childRect, descent, style);
} }
node = node->GetNext(); node = node->GetNext();
@ -2996,7 +2996,7 @@ wxRichTextParagraph::~wxRichTextParagraph()
} }
/// Draw the item /// Draw the item
bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style) bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style)
{ {
#if wxRICHTEXT_USE_DYNAMIC_STYLES #if wxRICHTEXT_USE_DYNAMIC_STYLES
wxTextAttrEx attr = GetCombinedAttributes(); wxTextAttrEx attr = GetCombinedAttributes();
@ -3081,7 +3081,8 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range),
while (node2) while (node2)
{ {
wxRichTextObject* child = node2->GetData(); wxRichTextObject* child = node2->GetData();
if (!child->GetRange().IsOutside(lineRange))
if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range))
{ {
// Draw this part of the line at the correct position // Draw this part of the line at the correct position
wxRichTextRange objectRange(child->GetRange()); wxRichTextRange objectRange(child->GetRange());