From 27f96820c883f29b8a3785300da231f0208fa59c Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 18 Jul 2011 17:58:17 +0200 Subject: [PATCH] fontsel: Use gtk_widget_class_set_accessible_role() --- gtk/a11y/gtkwindowaccessible.c | 26 ++++++++++---------------- gtk/gtkfontsel.c | 4 ++++ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c index ee3bbc6837..3bb44b5893 100644 --- a/gtk/a11y/gtkwindowaccessible.c +++ b/gtk/a11y/gtkwindowaccessible.c @@ -99,6 +99,7 @@ gtk_window_accessible_initialize (AtkObject *obj, gpointer data) { GtkWidget *widget = GTK_WIDGET (data); + const gchar *name; /* A GtkWindowAccessible can be created for a GtkHandleBox or a GtkWindow */ if (!GTK_IS_WINDOW (widget) && !GTK_IS_HANDLE_BOX (widget)) @@ -109,25 +110,18 @@ gtk_window_accessible_initialize (AtkObject *obj, g_signal_connect (data, "window-state-event", G_CALLBACK (window_state_event_cb), NULL); GTK_WIDGET_ACCESSIBLE (obj)->layer = ATK_LAYER_WINDOW; - if (GTK_IS_FONT_SELECTION_DIALOG (widget)) - obj->role = ATK_ROLE_FONT_CHOOSER; - else - { - const gchar *name; + name = gtk_widget_get_name (widget); - name = gtk_widget_get_name (widget); - - if (!g_strcmp0 (name, "gtk-tooltip")) - obj->role = ATK_ROLE_TOOL_TIP; + if (!g_strcmp0 (name, "gtk-tooltip")) + obj->role = ATK_ROLE_TOOL_TIP; #ifdef GDK_WINDOWING_X11 - else if (GTK_IS_PLUG (widget)) - obj->role = ATK_ROLE_PANEL; + else if (GTK_IS_PLUG (widget)) + obj->role = ATK_ROLE_PANEL; #endif - else if (gtk_window_get_window_type (GTK_WINDOW (widget)) == GTK_WINDOW_POPUP) - obj->role = ATK_ROLE_WINDOW; - else - obj->role = ATK_ROLE_FRAME; - } + else if (gtk_window_get_window_type (GTK_WINDOW (widget)) == GTK_WINDOW_POPUP) + obj->role = ATK_ROLE_WINDOW; + else + obj->role = ATK_ROLE_FRAME; /* Notify that tooltip is showing */ if (obj->role == ATK_ROLE_TOOL_TIP && gtk_widget_get_mapped (widget)) diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index f2162e8003..5f2b4dacd6 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -1642,6 +1642,10 @@ static GtkBuildableIface *parent_buildable_iface; static void gtk_font_selection_dialog_class_init (GtkFontSelectionDialogClass *klass) { + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_FONT_CHOOSER); + g_type_class_add_private (klass, sizeof (GtkFontSelectionDialogPrivate)); }