solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix memory leak in the art provider sample

Browse source 
The list client data must be destroyed not only when closing the
resource browser dialog (see 754f75c1cd (Fix memory leaks in artprov
sample, 2022-01-28) but also whenever the art client is changed.

Closes #23417.

Closes #23418.
This commit is contained in:
PB 2023-04-04 13:42:13 +02:00 • committed by Vadim Zeitlin
parent 04326551fd
commit 02cba46643
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
samples/artprov/artbrows.cpp
View file

@ -196,11 +196,7 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
wxArtBrowserDialog::~wxArtBrowserDialog()
{
const int itemCount = m_list->GetItemCount();
// item data are set by the ART_ICON macro
for ( int i = 0; i < itemCount; ++i )
delete reinterpret_cast<wxString*>(m_list->GetItemData(i));
DeleteListItemData();
}
wxSize wxArtBrowserDialog::GetSelectedBitmapSize() const
@ -209,6 +205,14 @@ wxSize wxArtBrowserDialog::GetSelectedBitmapSize() const
return wxSize(size, size);
}
void wxArtBrowserDialog::DeleteListItemData()
{
const int itemCount = m_list->GetItemCount();
// item data are set by the ART_ICON macro
for ( int i = 0; i < itemCount; ++i )
delete reinterpret_cast<wxString*>(m_list->GetItemData(i));
}
void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
{
@ -221,6 +225,7 @@ void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
long sel = m_list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
if (sel < 0) sel = 0;
DeleteListItemData();
m_list->DeleteAllItems();
FillBitmaps(img, m_list, index, client, wxSize(16, 16));
m_list->AssignImageList(img, wxIMAGE_LIST_SMALL);

2
samples/artprov/artbrows.h
View file

@ -34,6 +34,8 @@ private:
wxSize GetSelectedBitmapSize() const;
void DeleteListItemData();
wxListCtrl *m_list;
wxStaticBitmap *m_canvas;
wxStaticText *m_text;