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

Fix crash when undoing the deletion of a nested table column in wxRTC.

Browse Source 
Fix the object parent when applying the actions.

Closes #15186.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-06-10 15:52:41 +00:00
parent 3cb4951208
commit bf5e92db1c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/richtext/richtextbuffer.cpp
View File

@@ -10886,15 +10886,18 @@ bool wxRichTextAction::Do()
wxRichTextObject* obj = m_objectAddress.GetObject(m_buffer);
if (obj && m_object && m_ctrl)
{
// If the cloned object is unparented it will cause layout asserts later
// An alternative (would it always be valid?) could be to do: m_object->SetParent(obj->GetParent())
wxCHECK_MSG(m_object->GetParent(), false, "The stored object must have a valid parent");
// 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)
// so use the parent paragraph
wxRichTextParagraph* para = wxDynamicCast(obj->GetParent(), wxRichTextParagraph);
wxCHECK_MSG(para, false, "Invalid parent paragraph");
// The stored object, m_object, may have a stale parent paragraph. This would cause
// a crash during layout, so use obj's parent para, which should be the correct one.
// (An alternative would be to return the parent too from m_objectAddress.GetObject(),
// or to set obj's parent there before returning)
m_object->SetParent(para);
wxRichTextObjectList::compatibility_iterator node = para->GetChildren().Find(obj);
if (node)
{