From e4be2240b7a9709919c6e417a8b31b28014e3233 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 19 Nov 2001 01:08:51 +0000 Subject: Rename the GTK_DESTROYED flag to GTK_IN_DESTRUCTION, remove the Sun Nov 18 19:47:29 2001 Owen Taylor * gtk/gtkobject.h docs/Changes-2.0.txt: Rename the GTK_DESTROYED flag to GTK_IN_DESTRUCTION, remove the GTK_OBJECT_DESTROYED() check macro. * gtk/gtkbindings.c (gtk_bindings_activate): Remove instances of GTK_OBJECT_DESTROYED() that weren't needed any more. * gtk/gtkdialog.c: Exchange use of GTK_OBJECT_DESTROYED for a connection to ::destroy. --- gtk/gtkobject.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gtk/gtkobject.c') diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index 483a00e95..0c4736836 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -354,8 +354,8 @@ gtk_object_destroy (GtkObject *object) g_return_if_fail (object != NULL); g_return_if_fail (GTK_IS_OBJECT (object)); - if (!GTK_OBJECT_DESTROYED (object)) - g_object_run_dispose (G_OBJECT (object)); + if (!(GTK_OBJECT_FLAGS (object) & GTK_IN_DESTRUCTION)) + g_object_run_dispose (G_OBJECT (object)); } static void @@ -366,13 +366,13 @@ gtk_object_dispose (GObject *gobject) /* guard against reinvocations during * destruction with the GTK_DESTROYED flag. */ - if (!GTK_OBJECT_DESTROYED (object)) + if (!(GTK_OBJECT_FLAGS (object) & GTK_IN_DESTRUCTION)) { - GTK_OBJECT_SET_FLAGS (object, GTK_DESTROYED); + GTK_OBJECT_SET_FLAGS (object, GTK_IN_DESTRUCTION); gtk_signal_emit (object, object_signals[DESTROY]); - GTK_OBJECT_UNSET_FLAGS (object, GTK_DESTROYED); + GTK_OBJECT_UNSET_FLAGS (object, GTK_IN_DESTRUCTION); } G_OBJECT_CLASS (parent_class)->dispose (gobject); -- cgit v1.2.1