fix for [ 1044879 ] wxMSW 2.5.3: memleaks in listctrl.cpp and bug in listctrl sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -656,10 +656,12 @@ void MyFrame::OnDeleteAll(wxCommandEvent& WXUNUSED(event))
|
|||||||
{
|
{
|
||||||
wxStopWatch sw;
|
wxStopWatch sw;
|
||||||
|
|
||||||
|
size_t itemCount = m_listCtrl->GetItemCount();
|
||||||
|
|
||||||
m_listCtrl->DeleteAllItems();
|
m_listCtrl->DeleteAllItems();
|
||||||
|
|
||||||
m_logWindow->WriteText(wxString::Format(_T("Deleting %d items took %ld ms\n"),
|
m_logWindow->WriteText(wxString::Format(_T("Deleting %d items took %ld ms\n"),
|
||||||
m_listCtrl->GetItemCount(),
|
itemCount,
|
||||||
sw.Time()));
|
sw.Time()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -480,6 +480,8 @@ void wxListCtrl::FreeAllInternalData()
|
|||||||
m_ignoreChangeMessages = false;
|
m_ignoreChangeMessages = false;
|
||||||
|
|
||||||
m_AnyInternalData = false;
|
m_AnyInternalData = false;
|
||||||
|
|
||||||
|
m_count = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1917,7 +1919,6 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case LVN_DELETEALLITEMS:
|
case LVN_DELETEALLITEMS:
|
||||||
m_count = 0;
|
|
||||||
eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
|
eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
|
||||||
event.m_itemIndex = -1;
|
event.m_itemIndex = -1;
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user