Don't merge text objects if they have different identifiers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-06 12:44:21 +00:00
parent 254eb6841a
commit c6c68635d3
1 changed files with 3 additions and 0 deletions
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -7184,6 +7184,9 @@ bool wxRichTextPlainText::CanMerge(wxRichTextObject* object, wxRichTextDrawingCo
        if (!wxTextAttrEq(GetAttributes(), object->GetAttributes()) || !(m_properties == object->GetProperties()))
            return false;
            
+        if (!otherObj->GetId().IsEmpty() && GetId() != otherObj->GetId())
+            return false;
+
        // Check if differing virtual attributes makes it impossible to merge
        // these strings.