comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 21:58:37 -05:00
Code Issues Projects Releases Wiki Activity

Bookmarks: assure proper recursive cleanup of ItemData for all levels of a tree item

Browse Source
This commit is contained in:
vsonnier 2017-03-03 22:49:58 +01:00
parent aab899d63c
commit b30f9e9bbb
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/forms/Bookmark/BookmarkView.cpp
View File

@ -1597,8 +1597,10 @@ BookmarkRangeEntryPtr BookmarkView::makeActiveRangeEntry() {
void BookmarkView::DeleteSingleItem(wxTreeItemId item) {
//free the associated TreeItemData*, because contrary to doc, the associated data is not freed automatically by m_treeView->Delete(item) !
// this is needed to dec the ref count of shared_ptr within TreeViewItem.
//free the associated TreeItemData*, because contrary to doc,
// the associated data is not freed automatically by m_treeView->Delete(item) !
// this is also needed to decrement the ref count of shared_ptr within TreeViewItem,
//and prevent further memory leaks.
// (see source of vxWidgets 3.1)
TreeViewItem *itemData = itemToTVI(item);
if (itemData != NULL) {
@ -1613,6 +1615,14 @@ void BookmarkView::DeleteSingleItem(wxTreeItemId item) {
void BookmarkView::DeleteChildrenOfItem(wxTreeItemId item) {
FreeItemDataOfItemRecursively(item);
//this delete is naturally recursive.
m_treeView->DeleteChildren(item);
}
void BookmarkView::FreeItemDataOfItemRecursively(wxTreeItemId item) {
wxTreeItemIdValue cookieSearch;
wxTreeItemId currentChild = m_treeView->GetFirstChild(item, cookieSearch);
@ -1620,15 +1630,16 @@ void BookmarkView::DeleteChildrenOfItem(wxTreeItemId item) {
TreeViewItem *itemData = itemToTVI(currentChild);
if (itemData != NULL) {
delete itemData;
m_treeView->SetItemData(currentChild, NULL);
}
//Search children and Free item data recursively.
FreeItemDataOfItemRecursively(currentChild);
currentChild = m_treeView->GetNextChild(item, cookieSearch);
}
m_treeView->DeleteChildren(item);
} //end while
}

1
src/forms/Bookmark/BookmarkView.h
View File

@ -152,6 +152,7 @@ protected:
void SetTreeItemData(const wxTreeItemId& item, wxTreeItemData *data);
void DeleteSingleItem(wxTreeItemId item);
void DeleteChildrenOfItem(wxTreeItemId item);
void FreeItemDataOfItemRecursively(wxTreeItemId item);
MouseTracker mouseTracker;