summaryrefslogtreecommitdiff
path: root/gtk/gtkmain.c
diff options
context:
space:
mode:
authorTim Janik <timj@gimp.org>1998-03-15 21:14:28 +0000
committerTim Janik <timj@src.gnome.org>1998-03-15 21:14:28 +0000
commit16c6ee03aef8819c9057fdf3c22852e843084e2b (patch)
treeb9d3b0e5fc4a5bc3d6b8f3926e4ca79b55db3ee3 /gtk/gtkmain.c
parenteac28852edc1fce79e9f45f62d95ad116cf490d1 (diff)
downloadgtk+-16c6ee03aef8819c9057fdf3c22852e843084e2b.tar.gz
removed the ugly check whether we need gtk_widget_destroy or
Sun Mar 15 20:13:42 1998 Tim Janik <timj@gimp.org> * gtk/gtkmain.c (gtk_quit_destructor): removed the ugly check whether we need gtk_widget_destroy or gtk_object_destroy. these functions are by no means allowed to act differently! * gtk/gtkmisc.c (gtk_misc_set_alignment): check for _DRAWABLE instead of _VISIBLE to operate on widget->window. (gtk_misc_set_padding): likewise. * gtk/gtkwidget.c: slightly reordered object arguments. * gtk/gtkobject.c (gtk_object_setv): * gtk/gtkobject.c (gtk_object_getv): operator `!' has precedence over `&'.
Diffstat (limited to 'gtk/gtkmain.c')
-rw-r--r--gtk/gtkmain.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index b9156ec859..b0d021ba9e 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -949,12 +949,7 @@ static gint
gtk_quit_destructor (GtkObject **object_p)
{
if (*object_p)
- {
- if (GTK_IS_WIDGET (*object_p))
- gtk_widget_destroy ((GtkWidget*) *object_p);
- else
- gtk_object_destroy (*object_p);
- }
+ gtk_object_destroy (*object_p);
g_free (object_p);
return FALSE;