Commit aac4de4e authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/wxwindows/*: fixed a couple of memory leaks.
parent 4ae90d8f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc * playlist.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: messages.cpp,v 1.16 2003/09/07 22:53:09 fenrir Exp $ * $Id: messages.cpp,v 1.17 2003/11/25 00:58:41 gbazin Exp $
* *
* Authors: Olivier Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* *
...@@ -122,6 +122,11 @@ Messages::~Messages() ...@@ -122,6 +122,11 @@ Messages::~Messages()
{ {
/* Clean up */ /* Clean up */
if( save_log_dialog ) delete save_log_dialog; if( save_log_dialog ) delete save_log_dialog;
delete info_attr;
delete err_attr;
delete warn_attr;
delete dbg_attr;
} }
bool Messages::Show( bool show ) bool Messages::Show( bool show )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* preferences.cpp : wxWindows plugin for vlc * preferences.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: preferences.cpp,v 1.42 2003/10/29 22:25:11 zorglub Exp $ * $Id: preferences.cpp,v 1.43 2003/11/25 00:58:41 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -119,17 +119,19 @@ class ConfigTreeData : public wxTreeItemData ...@@ -119,17 +119,19 @@ class ConfigTreeData : public wxTreeItemData
{ {
public: public:
ConfigTreeData() { b_submodule = 0; panel = NULL; psz_section = NULL; } ConfigTreeData() { b_submodule = 0; panel = NULL; psz_section = NULL;
virtual ~ConfigTreeData() { if( panel ) delete panel; } psz_help = NULL; }
virtual ~ConfigTreeData() { if( panel ) delete panel;
if( psz_section) free(psz_section);
if( psz_help) free(psz_help); }
vlc_bool_t b_submodule; vlc_bool_t b_submodule;
char *psz_help;
PrefsPanel *panel; PrefsPanel *panel;
wxBoxSizer *sizer; wxBoxSizer *sizer;
int i_object_id; int i_object_id;
char *psz_section; char *psz_section;
char *psz_help;
}; };
/***************************************************************************** /*****************************************************************************
...@@ -362,7 +364,6 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf, ...@@ -362,7 +364,6 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
* Build a tree of the main options * Build a tree of the main options
*/ */
ConfigTreeData *config_data = new ConfigTreeData; ConfigTreeData *config_data = new ConfigTreeData;
config_data->psz_section = NULL;
config_data->i_object_id = GENERAL_ID; config_data->i_object_id = GENERAL_ID;
config_data->psz_help = wraptext( GENERAL_HELP, 72 , ISUTF8 ); config_data->psz_help = wraptext( GENERAL_HELP, 72 , ISUTF8 );
config_data->psz_section = strdup( GENERAL_TITLE ); config_data->psz_section = strdup( GENERAL_TITLE );
...@@ -417,7 +418,6 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf, ...@@ -417,7 +418,6 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
* Build a tree of all the plugins * Build a tree of all the plugins
*/ */
config_data = new ConfigTreeData; config_data = new ConfigTreeData;
config_data->psz_section = NULL;
config_data->i_object_id = PLUGIN_ID; config_data->i_object_id = PLUGIN_ID;
config_data->psz_help = wraptext( PLUGIN_HELP, 72, ISUTF8 ); config_data->psz_help = wraptext( PLUGIN_HELP, 72, ISUTF8 );
config_data->psz_section = strdup( PLUGIN_TITLE ); config_data->psz_section = strdup( PLUGIN_TITLE );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment