Rework the way we assign an accessible name to menu buttons, to make sure we pick up a label, should the button contain one, and only override the name with "Menu" as a fallback.
		
			
				
	
	
		
			120 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			120 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* GTK+ - accessibility implementations
 | 
						|
 * Copyright 2001 Sun Microsystems Inc.
 | 
						|
 *
 | 
						|
 * This library is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU Lesser General Public
 | 
						|
 * License as published by the Free Software Foundation; either
 | 
						|
 * version 2 of the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 * This library is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 * Lesser General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU Lesser General Public
 | 
						|
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 | 
						|
 */
 | 
						|
 | 
						|
#include "config.h"
 | 
						|
 | 
						|
#include <gtk/gtk.h>
 | 
						|
#include <glib/gi18n-lib.h>
 | 
						|
#include "gtkmenubuttonaccessible.h"
 | 
						|
 | 
						|
 | 
						|
G_DEFINE_TYPE (GtkMenuButtonAccessible, gtk_menu_button_accessible, GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE)
 | 
						|
 | 
						|
static void
 | 
						|
gtk_menu_button_accessible_initialize (AtkObject *accessible,
 | 
						|
                                        gpointer   data)
 | 
						|
{
 | 
						|
  ATK_OBJECT_CLASS (gtk_menu_button_accessible_parent_class)->initialize (accessible, data);
 | 
						|
}
 | 
						|
 | 
						|
static gint
 | 
						|
gtk_menu_button_accessible_get_n_children (AtkObject* obj)
 | 
						|
{
 | 
						|
  GtkWidget *widget;
 | 
						|
  GtkWidget *submenu;
 | 
						|
  gint count = 0;
 | 
						|
 | 
						|
  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
 | 
						|
  if (widget == NULL)
 | 
						|
    return count;
 | 
						|
 | 
						|
  submenu = GTK_WIDGET (gtk_menu_button_get_popup (GTK_MENU_BUTTON (widget)));
 | 
						|
  if (submenu)
 | 
						|
    {
 | 
						|
      GList *children;
 | 
						|
 | 
						|
      children = gtk_container_get_children (GTK_CONTAINER (submenu));
 | 
						|
      count = g_list_length (children);
 | 
						|
      g_list_free (children);
 | 
						|
    }
 | 
						|
  return count;
 | 
						|
}
 | 
						|
 | 
						|
static AtkObject *
 | 
						|
gtk_menu_button_accessible_ref_child (AtkObject *obj,
 | 
						|
                                      gint       i)
 | 
						|
{
 | 
						|
  AtkObject *accessible = NULL;
 | 
						|
  GtkWidget *widget;
 | 
						|
  GtkWidget *submenu;
 | 
						|
 | 
						|
  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
 | 
						|
  if (widget == NULL)
 | 
						|
    return NULL;
 | 
						|
 | 
						|
  submenu = GTK_WIDGET (gtk_menu_button_get_popup (GTK_MENU_BUTTON (widget)));
 | 
						|
  if (submenu)
 | 
						|
    {
 | 
						|
      GList *children;
 | 
						|
      GList *tmp_list;
 | 
						|
 | 
						|
      children = gtk_container_get_children (GTK_CONTAINER (submenu));
 | 
						|
      tmp_list = g_list_nth (children, i);
 | 
						|
      if (tmp_list)
 | 
						|
        {
 | 
						|
          accessible = gtk_widget_get_accessible (GTK_WIDGET (tmp_list->data));
 | 
						|
          g_object_ref (accessible);
 | 
						|
        }
 | 
						|
      g_list_free (children);
 | 
						|
    }
 | 
						|
 | 
						|
  return accessible;
 | 
						|
}
 | 
						|
 | 
						|
static const gchar *
 | 
						|
gtk_menu_button_accessible_get_name (AtkObject *obj)
 | 
						|
{
 | 
						|
  const gchar *name = NULL;
 | 
						|
  GtkWidget *widget;
 | 
						|
 | 
						|
  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
 | 
						|
  if (widget == NULL)
 | 
						|
    return NULL;
 | 
						|
 | 
						|
  name = ATK_OBJECT_CLASS (gtk_menu_button_accessible_parent_class)->get_name (obj);
 | 
						|
  if (name != NULL)
 | 
						|
    return name;
 | 
						|
 | 
						|
  return _("Menu");
 | 
						|
}
 | 
						|
 | 
						|
static void
 | 
						|
gtk_menu_button_accessible_class_init (GtkMenuButtonAccessibleClass *klass)
 | 
						|
{
 | 
						|
  AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
 | 
						|
 | 
						|
  class->get_name = gtk_menu_button_accessible_get_name;
 | 
						|
  class->initialize = gtk_menu_button_accessible_initialize;
 | 
						|
  class->get_n_children = gtk_menu_button_accessible_get_n_children;
 | 
						|
  class->ref_child = gtk_menu_button_accessible_ref_child;
 | 
						|
}
 | 
						|
 | 
						|
static void
 | 
						|
gtk_menu_button_accessible_init (GtkMenuButtonAccessible *menu_button)
 | 
						|
{
 | 
						|
}
 |