From 6981d3ecf681f6f8217ff74053f229d759ffd168 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 8 Sep 2000 14:36:00 +0000 Subject: [PATCH] Fixed memory leak in listbox, fixed memory leak reporting in app.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/app.cpp | 2 +- src/gtk/listbox.cpp | 2 ++ src/gtk1/app.cpp | 2 +- src/gtk1/listbox.cpp | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index f447052121..b452afc77a 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -548,7 +548,7 @@ void wxApp::CleanUp() // check for memory leaks #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - if (wxDebugContext::CountObjectsLeft() > 0) + if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { wxLogDebug(wxT("There were memory leaks.\n")); wxDebugContext::Dump(); diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 4412ded52a..308faa01e1 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -361,6 +361,8 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, wxListBox::~wxListBox() { Clear(); + if (m_strings) + delete m_strings; } void wxListBox::DoInsertItems(const wxArrayString& items, int pos) diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index f447052121..b452afc77a 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -548,7 +548,7 @@ void wxApp::CleanUp() // check for memory leaks #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - if (wxDebugContext::CountObjectsLeft() > 0) + if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { wxLogDebug(wxT("There were memory leaks.\n")); wxDebugContext::Dump(); diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 4412ded52a..308faa01e1 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -361,6 +361,8 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, wxListBox::~wxListBox() { Clear(); + if (m_strings) + delete m_strings; } void wxListBox::DoInsertItems(const wxArrayString& items, int pos) -- 2.45.2