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

Backported part of r75124: Generalised wxRICHTEXT_CHANGE_OBJECT command so it can now apply to a paragraph as well as an object within a paragraph.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-11-17 10:37:24 +00:00
parent 1b5478af74
commit 048e3b6e67
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/richtext/richtextbuffer.cpp
View File

@@ -11519,21 +11519,29 @@ bool wxRichTextAction::Do()
// The plan is to swap the current object with the stored, previous-state, clone // The plan is to swap the current object with the stored, previous-state, clone
// We can't get 'node' from the containing buffer (as it doesn't directly store objects) // We can't get 'node' from the containing buffer (as it doesn't directly store objects)
// so use the parent paragraph // so use the parent paragraph
wxRichTextParagraph* para = wxDynamicCast(obj->GetParent(), wxRichTextParagraph); wxRichTextCompositeObject* parent = wxDynamicCast(obj->GetParent(), wxRichTextCompositeObject);
wxCHECK_MSG(para, false, "Invalid parent paragraph"); wxCHECK_MSG(parent, false, wxT("Invalid parent"));
// The stored object, m_object, may have a stale parent paragraph. This would cause // Check that at least one is a paragraph, but not both.
// a crash during layout, so use obj's parent para, which should be the correct one. wxCHECK_MSG((!obj->IsKindOf(CLASSINFO(wxRichTextParagraph)) && parent->IsKindOf(CLASSINFO(wxRichTextParagraph))) ||
(obj->IsKindOf(CLASSINFO(wxRichTextParagraph)) && !parent->IsKindOf(CLASSINFO(wxRichTextParagraph)))
, false, wxT("Either the object or the parent must be a paragraph"));
// The stored object, m_object, may have a stale parent. This would cause
// a crash during layout, so use obj's parent, which should be the correct one.
// (An alternative would be to return the parent too from m_objectAddress.GetObject(), // (An alternative would be to return the parent too from m_objectAddress.GetObject(),
// or to set obj's parent there before returning) // or to set obj's parent there before returning)
m_object->SetParent(para); m_object->SetParent(parent);
if (parent)
wxRichTextObjectList::compatibility_iterator node = para->GetChildren().Find(obj);
if (node)
{ {
wxRichTextObject* obj = node->GetData(); wxRichTextObjectList::compatibility_iterator node = parent->GetChildren().Find(obj);
node->SetData(m_object); if (node)
m_object = obj; {
wxRichTextObject* obj = node->GetData();
node->SetData(m_object);
m_object = obj;
m_object->SetParent(NULL);
}
} }
} }