diff options
author | Owen Taylor <otaylor@redhat.com> | 2003-12-08 22:55:03 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2003-12-08 22:55:03 +0000 |
commit | 85c05a86c05e002c8160ecabe73a372b267b6931 (patch) | |
tree | d1bed6fe58a6aac22fa33e45e51a53c25edb17d7 /gtk/gtkmenuitem.c | |
parent | dfddc2062865c901d7ab9de90214f3aed89bd4eb (diff) | |
download | gtk+-85c05a86c05e002c8160ecabe73a372b267b6931.tar.gz |
=== Released 2.3.1 ===
Mon Dec 8 10:54:44 2003 Owen Taylor <otaylor@redhat.com>
* === Released 2.3.1 ===
* NEWS: Updates for 2.3.1
* configure.in: Version 2.3.1, interface age 0, binary age 301.
* gtk/gtkmenuitem.c (gtk_menu_item_can_activate_accel):
Rename from gtk_menu_item_real_can_activate_accel() to
match GTK+ convention, improve comment.
* gtk/gtkwidget.c: Document gtk_widget_can_activate_accel(),
can ::can-activate-accel signal.
* gtk/gtkwidget.c (closure_accel_activate): Fix spelling
in comment.
* gtk/gtkmenu.c (gtk_menu_real_can_activate_accel): Clean
up comment.
* gtk/gtkcellview{,menuitem}.[ch]: Move GET_PRIVATE() macros
into the .c file.
Mon Dec 8 12:09:21 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkicontheme.c (find_builtin_icon): Fix a
missing 'else'. (#128816, Jorn Baayen)
Diffstat (limited to 'gtk/gtkmenuitem.c')
-rw-r--r-- | gtk/gtkmenuitem.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index ac594005d1..c3c41b2154 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -89,8 +89,8 @@ static void gtk_menu_item_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); -static gboolean gtk_menu_item_real_can_activate_accel (GtkWidget *widget, - guint signal_id); +static gboolean gtk_menu_item_can_activate_accel (GtkWidget *widget, + guint signal_id); static GtkItemClass *parent_class; @@ -149,7 +149,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) widget_class->hide_all = gtk_menu_item_hide_all; widget_class->mnemonic_activate = gtk_menu_item_mnemonic_activate; widget_class->parent_set = gtk_menu_item_parent_set; - widget_class->can_activate_accel = gtk_menu_item_real_can_activate_accel; + widget_class->can_activate_accel = gtk_menu_item_can_activate_accel; container_class->forall = gtk_menu_item_forall; @@ -1218,10 +1218,10 @@ gtk_menu_item_hide_all (GtkWidget *widget) } static gboolean -gtk_menu_item_real_can_activate_accel (GtkWidget *widget, - guint signal_id) +gtk_menu_item_can_activate_accel (GtkWidget *widget, + guint signal_id) { - /* defer to parent menu to allow accel activation */ + /* Chain to the parent GtkMenu for further checks */ return (GTK_WIDGET_IS_SENSITIVE (widget) && GTK_WIDGET_VISIBLE (widget) && widget->parent && gtk_widget_can_activate_accel (widget->parent, signal_id)); } |