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

Bug fix for empty objects

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2008-04-27 17:17:18 +00:00
parent 7051fa4161
commit affbfa1f29
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/richtext/richtextbuffer.cpp
View File

@@ -3206,7 +3206,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
{ {
wxRichTextObject* child = node2->GetData(); wxRichTextObject* child = node2->GetData();
if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range)) if (child->GetRange().GetLength() > 0 && !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());
@@ -3251,6 +3251,9 @@ static int wxRichTextGetRangeWidth(const wxRichTextParagraph& para, const wxRich
{ {
wxASSERT(partialExtents.GetCount() >= (size_t) range.GetLength()); wxASSERT(partialExtents.GetCount() >= (size_t) range.GetLength());
if (partialExtents.GetCount() < (size_t) range.GetLength())
return 0;
int leftMostPos = 0; int leftMostPos = 0;
if (range.GetStart() - para.GetRange().GetStart() > 0) if (range.GetStart() - para.GetRange().GetStart() > 0)
leftMostPos = partialExtents[range.GetStart() - para.GetRange().GetStart() - 1]; leftMostPos = partialExtents[range.GetStart() - para.GetRange().GetStart() - 1];
@@ -3353,6 +3356,12 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
{ {
wxRichTextObject* child = node->GetData(); wxRichTextObject* child = node->GetData();
if (child->GetRange().GetLength() == 0)
{
node = node->GetNext();
continue;
}
// If this is e.g. a composite text box, it will need to be laid out itself. // If this is e.g. a composite text box, it will need to be laid out itself.
// But if just a text fragment or image, for example, this will // But if just a text fragment or image, for example, this will
// do nothing. NB: won't we need to set the position after layout? // do nothing. NB: won't we need to set the position after layout?
@@ -3542,7 +3551,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
{ {
wxRichTextObject* child = node2->GetData(); wxRichTextObject* child = node2->GetData();
if (!child->GetRange().IsOutside(lineRange)) if (child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange))
{ {
wxRichTextRange rangeToUse = lineRange; wxRichTextRange rangeToUse = lineRange;
rangeToUse.LimitTo(child->GetRange()); rangeToUse.LimitTo(child->GetRange());