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

More Erase substitutions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-10-22 09:24:49 +00:00
parent 11ef729d54
commit 9e31a66087
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/richtext/richtextbuffer.cpp
View File

@@ -370,7 +370,7 @@ bool wxRichTextCompositeObject::Defragment()
if (child->CanMerge(nextChild) && child->Merge(nextChild)) if (child->CanMerge(nextChild) && child->Merge(nextChild))
{ {
nextChild->Dereference(); nextChild->Dereference();
delete node->GetNext(); m_children.Erase(node->GetNext());
// Don't set node -- we'll see if we can merge again with the next // Don't set node -- we'll see if we can merge again with the next
// child. // child.
@@ -1352,7 +1352,7 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range)
} }
wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext(); wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();
delete node1; nextParagraph->GetChildren().Erase(node1);
node1 = next1; node1 = next1;
} }
@@ -3418,7 +3418,7 @@ bool wxRichTextBuffer::EndStyle()
wxNode* node = m_attributeStack.GetLast(); wxNode* node = m_attributeStack.GetLast();
wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData(); wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData();
delete node; m_attributeStack.Erase(node);
SetDefaultStyle(*attr); SetDefaultStyle(*attr);