From bf9728b3d738aae632a8282883a06049a9508911 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 6 Apr 2003 15:36:12 +0000 Subject: [PATCH] Fixed memory leak in generic wxFileDialog Backported from head git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/generic/filedlgg.cpp | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index 2330662962..5c32249fc8 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -199,6 +199,7 @@ wxGTK: - fixed bug in generic file selector causing incomplete file extensions to be appended to filenames with no extension - added SetSelection implementation for GTK+ 2 +- fixed a memory leak in generic wxFileDialog wxMSW: diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index bcb998dbce..00d93073b3 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -1245,6 +1245,13 @@ wxFileDialog::~wxFileDialog() wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), ms_lastShowHidden); } + + const size_t count = m_choice->GetCount(); + size_t i; + for ( i = 0; i < count; i++ ) + { + delete (wxString *)m_choice->GetClientData(i); + } } int wxFileDialog::ShowModal()