AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

a11y: Only advertise action if menuitems are selectable

Browse Source 
There's no "click" action for separatormenuitems, for example.
This commit is contained in:
Benjamin Otte 2011-07-11 03:08:32 +02:00
parent a82cbf29a2
commit 17d5afcae2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/a11y/gtkmenuitemaccessible.c
View File

@ -21,6 +21,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkmenuitemaccessible.h" #include "gtkmenuitemaccessible.h"
#include "gtksubmenuitemaccessible.h" #include "gtksubmenuitemaccessible.h"
#include "gtk/gtkmenuitemprivate.h"
#define KEYBINDING_SEPARATOR ";" #define KEYBINDING_SEPARATOR ";"
@ -381,6 +382,15 @@ gtk_menu_item_accessible_do_action (AtkAction *action,
static gint static gint
gtk_menu_item_accessible_get_n_actions (AtkAction *action) gtk_menu_item_accessible_get_n_actions (AtkAction *action)
{ {
GtkWidget *item;
item = gtk_accessible_get_widget (GTK_ACCESSIBLE (action));
if (item == NULL)
return 0;
if (!_gtk_menu_item_is_selectable (item))
return 0;
return 1; return 1;
} }
@ -388,7 +398,7 @@ static const gchar *
gtk_menu_item_accessible_action_get_name (AtkAction *action, gtk_menu_item_accessible_action_get_name (AtkAction *action,
gint i) gint i)
{ {
if (i != 0) if (i != 0 || gtk_menu_item_accessible_get_n_actions (action) == 0)
return NULL; return NULL;
return "click"; return "click";