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

fixing memory leaks on three levels (bug report 1905138)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-05-04 13:55:14 +00:00
parent e388dc214c
commit 2b3bddf68b
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mac/carbon/listctrl_mac.cpp
View File

@@ -771,6 +771,8 @@ wxListCtrl::~wxListCtrl()
delete m_imageListState; delete m_imageListState;
delete m_renameTimer; delete m_renameTimer;
WX_CLEAR_LIST(wxColumnList, m_colsInfo);
} }
/*static*/ /*static*/
@@ -2418,6 +2420,7 @@ void wxListCtrl::SetFocus()
wxMacListCtrlItem::~wxMacListCtrlItem() wxMacListCtrlItem::~wxMacListCtrlItem()
{ {
WX_CLEAR_HASH_MAP( wxListItemList, m_rowItems );
} }
void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner , void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
@@ -2997,18 +3000,27 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
DataBrowserItemNotification message, DataBrowserItemNotification message,
DataBrowserItemDataRef WXUNUSED(itemData) ) DataBrowserItemDataRef itemData )
{ {
// we want to depend on as little as possible to make sure tear-down of controls is safe wxMacListCtrlItem *item = NULL;
if ( message == kDataBrowserItemRemoved) if ( !m_isVirtual )
{ {
// make sure MacDelete does the proper teardown. item = (wxMacListCtrlItem *) itemID;
}
// we want to depend on as little as possible to make sure tear-down of controls is safe
if ( message == kDataBrowserItemRemoved )
{
if ( item )
item->Notification(this, message, itemData);
return; return;
} }
else if ( message == kDataBrowserItemAdded ) else if ( message == kDataBrowserItemAdded )
{ {
// we don't issue events on adding, the item is not really stored in the list yet, so we // we don't issue events on adding, the item is not really stored in the list yet, so we
// avoid asserts by getting out now // avoid asserts by getting out now
if ( item )
item->Notification(this, message, itemData);
return ; return ;
} }