diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 15:46:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 15:46:18 +0000 |
| commit | 5e49fba6e5c6989146903ff76a52c0e6e211d75b (patch) | |
| tree | 76bc25f166f11d4ac59770d16c861e796257d94c /vcl/unx/gtk/window/gtkobject.cxx | |
| parent | f39f058338ec9c231dfa2ac06d15e6c5389c933f (diff) | |
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
Diffstat (limited to 'vcl/unx/gtk/window/gtkobject.cxx')
| -rw-r--r-- | vcl/unx/gtk/window/gtkobject.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
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 ); } } |