diff options
| author | James Henstridge <james@daa.com.au> | 2001-07-25 13:36:02 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2001-07-25 13:36:02 +0000 |
| commit | e70939234cf3af180b4d2a695a0076b4538a3889 (patch) | |
| tree | 5e26f207b4f43cc10ee5445ca8083138fb86b66c /gtk/gtkitemfactory.c | |
| parent | afacc246f17fa078fa9a47f7496d570a1b0f97c8 (diff) | |
| download | gtk+-e70939234cf3af180b4d2a695a0076b4538a3889.tar.gz | |
commiting patch after comments from Alex on IRC
2001-07-15 James Henstridge <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.
(gtk_window_remove_accel_group): same here.
(gtk_window_key_press_event): same here.
* gtk/gtkwidget.c (gtk_widget_add_accelerator): cast to GObject.
(gtk_widget_remove_accelerator): same here.
(gtk_widget_remove_accelerators): same here.
* gtk/gtkplug.c (gtk_plug_accel_entries_changed): same here.
* gtk/gtkmenushell.c (gtk_menu_shell_key_press): cast to GObject
instead of GtkObject.
* gtk/gtkmenu.c (gtk_menu_key_press): update since GtkAccelGroup
now takes GObjects.
* gtk/gtkitemfactory.c (gtk_item_factory_propagate_accelerator):
pass a GObject to gtk_accel_group_entries_from_object.
(gtk_item_factory_create_item): s/accel_widget/accel_object/
* gtk/gtk-boxed.defs: remove GtkAccelGroup boxed def.
* gtk/gtkaccellabel.c: convert to handle GObject accel objects.
* gtk/gtkaccellabel.h: fix header to reflect that arbitrary
GObjects can have accelerators set now. Add compatibility
defines.
* gtk/gtkmarshal.list: add missing marshallers.
* gtk/gtkaccelgroup.[ch]: convert to a GObject, and allow setting
accelerators on plain GObjects. gtk_accel_group_object_destroy
has been converted into a weak reference, and
gtk_accel_group_delete_entries is now a destroy notify for that
piece of data.
Diffstat (limited to 'gtk/gtkitemfactory.c')
| -rw-r--r-- | gtk/gtkitemfactory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 93b603c1b9..d9c8b58ef6 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -335,7 +335,7 @@ gtk_item_factory_propagate_accelerator (GtkItemFactoryItem *item, { GSList *work; - work = gtk_accel_group_entries_from_object (GTK_OBJECT (widget)); + work = gtk_accel_group_entries_from_object (G_OBJECT (widget)); while (work) { GtkAccelEntry *ac_entry; @@ -1266,7 +1266,7 @@ gtk_item_factory_create_item (GtkItemFactory *ifactory, label = gtk_widget_new (GTK_TYPE_ACCEL_LABEL, "GtkWidget::visible", TRUE, "GtkWidget::parent", widget, - "GtkAccelLabel::accel_widget", widget, + "GtkAccelLabel::accel_object", widget, "GtkMisc::xalign", 0.0, NULL); |