diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-11-19 01:08:51 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-19 01:08:51 +0000 |
| commit | e4be2240b7a9709919c6e417a8b31b28014e3233 (patch) | |
| tree | 3ddb33f39e79a893ac5ba6f62cb921605964b81f /gtk/gtkbindings.c | |
| parent | 3432dff2e0c21fa693d41e3950ee19624c03f58c (diff) | |
| download | gtk+-e4be2240b7a9709919c6e417a8b31b28014e3233.tar.gz | |
Rename the GTK_DESTROYED flag to GTK_IN_DESTRUCTION, remove the
Sun Nov 18 19:47:29 2001 Owen Taylor <otaylor@redhat.com>
* 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.
Diffstat (limited to 'gtk/gtkbindings.c')
| -rw-r--r-- | gtk/gtkbindings.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index 902410e119..30cb56d28e 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -414,7 +414,7 @@ gtk_binding_entry_activate (GtkBindingEntry *entry, gtk_signal_emitv (object, signal_id, params); g_free (params); - if (GTK_OBJECT_DESTROYED (object) || entry->destroyed) + if (entry->destroyed) break; } @@ -504,15 +504,12 @@ gtk_binding_set_activate (GtkBindingSet *binding_set, keyval = gdk_keyval_to_lower (keyval); modifiers = modifiers & BINDING_MOD_MASK (); - if (!GTK_OBJECT_DESTROYED (object)) + entry = binding_ht_lookup_entry (binding_set, keyval, modifiers); + if (entry) { - entry = binding_ht_lookup_entry (binding_set, keyval, modifiers); - if (entry) - { - gtk_binding_entry_activate (entry, object); - - return TRUE; - } + gtk_binding_entry_activate (entry, object); + + return TRUE; } return FALSE; @@ -887,7 +884,7 @@ gtk_bindings_activate (GtkObject *object, g_return_val_if_fail (object != NULL, FALSE); g_return_val_if_fail (GTK_IS_OBJECT (object), FALSE); - if (!GTK_IS_WIDGET (object) || GTK_OBJECT_DESTROYED (object)) + if (!GTK_IS_WIDGET (object)) return FALSE; widget = GTK_WIDGET (object); |