callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fontsel: Use gtk_widget_class_set_accessible_role()

Browse Source
This commit is contained in:
Benjamin Otte
2011-07-18 17:58:17 +02:00
parent c40875ad51
commit 27f96820c8
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/a11y/gtkwindowaccessible.c
View File

@ -99,6 +99,7 @@ gtk_window_accessible_initialize (AtkObject *obj,
gpointer data) gpointer data)
{ {
GtkWidget *widget = GTK_WIDGET (data); GtkWidget *widget = GTK_WIDGET (data);
const gchar *name;
/* A GtkWindowAccessible can be created for a GtkHandleBox or a GtkWindow */ /* A GtkWindowAccessible can be created for a GtkHandleBox or a GtkWindow */
if (!GTK_IS_WINDOW (widget) && !GTK_IS_HANDLE_BOX (widget)) 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); g_signal_connect (data, "window-state-event", G_CALLBACK (window_state_event_cb), NULL);
GTK_WIDGET_ACCESSIBLE (obj)->layer = ATK_LAYER_WINDOW; GTK_WIDGET_ACCESSIBLE (obj)->layer = ATK_LAYER_WINDOW;
if (GTK_IS_FONT_SELECTION_DIALOG (widget)) name = gtk_widget_get_name (widget);
obj->role = ATK_ROLE_FONT_CHOOSER;
else
{
const gchar *name;
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 #ifdef GDK_WINDOWING_X11
else if (GTK_IS_PLUG (widget)) else if (GTK_IS_PLUG (widget))
obj->role = ATK_ROLE_PANEL; obj->role = ATK_ROLE_PANEL;
#endif #endif
else if (gtk_window_get_window_type (GTK_WINDOW (widget)) == GTK_WINDOW_POPUP) else if (gtk_window_get_window_type (GTK_WINDOW (widget)) == GTK_WINDOW_POPUP)
obj->role = ATK_ROLE_WINDOW; obj->role = ATK_ROLE_WINDOW;
else else
obj->role = ATK_ROLE_FRAME; obj->role = ATK_ROLE_FRAME;
}
/* Notify that tooltip is showing */ /* Notify that tooltip is showing */
if (obj->role == ATK_ROLE_TOOL_TIP && gtk_widget_get_mapped (widget)) if (obj->role == ATK_ROLE_TOOL_TIP && gtk_widget_get_mapped (widget))

4
gtk/gtkfontsel.c
View File

@ -1642,6 +1642,10 @@ static GtkBuildableIface *parent_buildable_iface;
static void static void
gtk_font_selection_dialog_class_init (GtkFontSelectionDialogClass *klass) 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)); g_type_class_add_private (klass, sizeof (GtkFontSelectionDialogPrivate));
} }