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/gtkmenu.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/gtkmenu.c')
| -rw-r--r-- | gtk/gtkmenu.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 80b554c95f..25bf3e6500 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1423,13 +1423,18 @@ static gboolean gtk_menu_real_can_activate_accel (GtkWidget *widget, guint signal_id) { - /* menu items chain here to figure whether they can activate their accelerators. - * despite ordinary widgets, menus allow accel activation even if invisible - * since that's the usual case for submenus/popup-menus. however, the state - * of the attach widget affects "activeness" of the menu. + /* Menu items chain here to figure whether they can activate their + * accelerators. Unlike ordinary widgets, menus allow accel + * activation even if invisible since that's the usual case for + * submenus/popup-menus. however, the state of the attach widget + * affects the "activeness" of the menu. */ GtkWidget *awidget = gtk_menu_get_attach_widget (GTK_MENU (widget)); - return awidget ? gtk_widget_can_activate_accel (awidget, signal_id) : GTK_WIDGET_IS_SENSITIVE (widget); + + if (awidget) + return gtk_widget_can_activate_accel (awidget, signal_id); + else + return GTK_WIDGET_IS_SENSITIVE (widget); } /** |