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.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gtk/gtkobject.h') diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h index 9f1ce10180..f025a4d41d 100644 --- a/gtk/gtkobject.h +++ b/gtk/gtkobject.h @@ -57,7 +57,7 @@ G_BEGIN_DECLS */ typedef enum { - GTK_DESTROYED = 1 << 0, + GTK_IN_DESTRUCTION = 1 << 0, /* Used internally during dispose */ GTK_FLOATING = 1 << 1, GTK_RESERVED_1 = 1 << 2, GTK_RESERVED_2 = 1 << 3 @@ -66,7 +66,6 @@ typedef enum /* Macros for extracting the object_flags from GtkObject. */ #define GTK_OBJECT_FLAGS(obj) (GTK_OBJECT (obj)->flags) -#define GTK_OBJECT_DESTROYED(obj) ((GTK_OBJECT_FLAGS (obj) & GTK_DESTROYED) != 0) #define GTK_OBJECT_FLOATING(obj) ((GTK_OBJECT_FLAGS (obj) & GTK_FLOATING) != 0) #define GTK_OBJECT_CONNECTED(obj) ((GTK_OBJECT_FLAGS (obj) & GTK_CONNECTED) != 0) -- cgit v1.2.1