summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-06 11:00:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-06 11:26:38 +0000
commit6b1a10244857fcb099c1a12b92eb6a2f6ac894b4 (patch)
treeb5d992e310d2134e36da2e4edec763d599d72987 /vcl
parentd99251cecd8a2094bacf55c5f8f2242dc874c0e3 (diff)
make it easier to find leaks by dropping globals at exit
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx1
-rw-r--r--vcl/unx/gtk/app/gtkdata.cxx5
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx1
3 files changed, 6 insertions, 1 deletions
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 21fb1e4b32bc..63b8ae315f80 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -113,6 +113,7 @@ public:
virtual ~GtkData();
virtual void Init();
+ virtual void Dispose();
virtual void initNWF();
virtual void deInitNWF();
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 7141ded7f721..3b62677af45b 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -550,6 +550,11 @@ GtkData::~GtkData()
osl_destroyMutex( m_aDispatchMutex );
}
+void GtkData::Dispose()
+{
+ deInitNWF();
+}
+
void GtkData::Yield( bool bWait, bool bHandleAllCurrentEvents )
{
/* #i33212# only enter g_main_context_iteration in one thread at any one
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 97299151cd6f..6669a9717ddb 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -467,7 +467,6 @@ void GtkData::initNWF( void )
*********************************************************/
void GtkData::deInitNWF( void )
{
-
for( unsigned int i = 0; i < gWidgetData.size(); i++ )
{
// free up global widgets