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

Don't delete composite objects when defragmenting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-10-29 13:18:15 +00:00
parent a026533712
commit 1a35779dcd
1 changed files with 68 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/richtext/richtextbuffer.cpp
View File

@@ -1430,8 +1430,12 @@ bool wxRichTextCompositeObject::Defragment(wxRichTextDrawingContext& context, co
{ {
wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject); wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject);
if (composite) if (composite)
{
composite->Defragment(context); composite->Defragment(context);
node = node->GetNext();
}
else
{
// Optimization: if there are no virtual attributes, we won't need to // Optimization: if there are no virtual attributes, we won't need to
// to split objects in order to paint individually attributed chunks. // to split objects in order to paint individually attributed chunks.
// So only merge in this case. // So only merge in this case.
@@ -1509,6 +1513,7 @@ bool wxRichTextCompositeObject::Defragment(wxRichTextDrawingContext& context, co
node = node->GetNext(); node = node->GetNext();
} }
} }
}
else else
node = node->GetNext(); node = node->GetNext();
} }