From 5e49fba6e5c6989146903ff76a52c0e6e211d75b Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Tue, 9 Nov 2004 15:46:18 +0000
Subject: INTEGRATION: CWS vcl28 (1.3.114); FILE MERGED 2004/11/02 16:31:16 pl
1.3.114.2: #i32682# avoid an assertion 2004/09/30 11:07:58 pl 1.3.114.1: join
from vcl27
---
vcl/unx/gtk/window/gtkobject.cxx | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
(limited to 'vcl/unx/gtk/window/gtkobject.cxx')
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index 3183d2515ac6..485329340756 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: gtkobject.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hr $ $Date: 2004-10-13 08:57:47 $
+ * last change: $Author: hr $ $Date: 2004-11-09 16:46:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -115,7 +115,11 @@ GtkSalObject::~GtkSalObject()
gtk_container_remove( GTK_CONTAINER(gtk_widget_get_parent(m_pSocket)),
m_pSocket );
// get rid of the socket
- gtk_widget_destroy( m_pSocket );
+ // actually the gtk_container_remove should let the ref count
+ // of the socket sink to 0 and destroy it (see signalDestroy)
+ // this is just a sanity check
+ if( m_pSocket )
+ gtk_widget_destroy( m_pSocket );
}
}
--
cgit v1.2.3