summaryrefslogtreecommitdiff
path: root/gtk/gtkaccelgroup.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-11-21 17:04:35 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-11-21 17:04:35 +0000
commitc860866dd794b8abb0d185802d0a0dd17c5005ac (patch)
tree66eefe3e2b8cc52c655b072caa1be719ab7fa388 /gtk/gtkaccelgroup.h
parentd5db986a0b11b2cb7ca4fb93a2d2d40c371d5cf2 (diff)
downloadgtk+-c860866dd794b8abb0d185802d0a0dd17c5005ac.tar.gz
Ref-sink the tooltips object. Ref-sink the tooltips object. Fix some
Wed Nov 21 11:41:29 2001 Owen Taylor <otaylor@redhat.com> * tests/testgtk.c (create_tooltips): Ref-sink the tooltips object. * gtk/gtktoolbar.c (gtk_toolbar_init): Ref-sink the tooltips object. * gtk/gtkfilesel.c (open_new_dir): Fix some constness warnings. * gtk/gtkaccelgroup.c: Rename gtk_accel_groups_from_acceleratable() back to gtk_accel_groups_from_object(), change @acceleratable parameter to gtk_accel_groups_activate() accordingly. * gtk/gtkaccelmap.c (gtk_accel_map_lookup_entry): Remove left-over comment about quark return. * gtk/gtkaccelmap.h: Fix spelling of gtk_accel_map_foreach_unfiltered(). * gtk/gtk-boxed.defs (GtkIconSource): added as a boxed type. (Patch from Matt Wilson) * gtk/gtkobject.c (gtk_object_finalize): Warn if a floating object is finalized.
Diffstat (limited to 'gtk/gtkaccelgroup.h')
-rw-r--r--gtk/gtkaccelgroup.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index cfb207f8a7..47d50cebae 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -112,10 +112,10 @@ void _gtk_accel_group_attach (GtkAccelGroup *accel_group,
GObject *object);
void _gtk_accel_group_detach (GtkAccelGroup *accel_group,
GObject *object);
-gboolean gtk_accel_groups_activate (GObject *acceleratable,
+gboolean gtk_accel_groups_activate (GObject *object,
guint accel_key,
GdkModifierType accel_mods);
-GSList* gtk_accel_groups_from_acceleratable (GObject *object);
+GSList* gtk_accel_groups_from_object (GObject *object);
GtkAccelKey* gtk_accel_group_find (GtkAccelGroup *accel_group,
gboolean (*find_func) (GtkAccelKey *key,
GClosure *closure,