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

Don't merge text objects if they have different identifiers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-11-06 12:44:21 +00:00
parent 254eb6841a
commit c6c68635d3
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/richtext/richtextbuffer.cpp
View File

@@ -7184,6 +7184,9 @@ bool wxRichTextPlainText::CanMerge(wxRichTextObject* object, wxRichTextDrawingCo
if (!wxTextAttrEq(GetAttributes(), object->GetAttributes()) || !(m_properties == object->GetProperties())) if (!wxTextAttrEq(GetAttributes(), object->GetAttributes()) || !(m_properties == object->GetProperties()))
return false; return false;
if (!otherObj->GetId().IsEmpty() && GetId() != otherObj->GetId())
return false;
// Check if differing virtual attributes makes it impossible to merge // Check if differing virtual attributes makes it impossible to merge
// these strings. // these strings.