summaryrefslogtreecommitdiff
path: root/gtk/gtkwidget.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-10-14 15:52:24 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-10-25 07:38:36 -0400
commitdf1e2cd128782c49f0cf0b6dbe6729edfce72be3 (patch)
tree3d30848d62f7d1913bee645e6d76c5874d7d9c03 /gtk/gtkwidget.c
parentb195c7dbb204403f8cb51a40151b9d39d38abafc (diff)
downloadgtk+-df1e2cd128782c49f0cf0b6dbe6729edfce72be3.tar.gz
Fix more test breakage
Diffstat (limited to 'gtk/gtkwidget.c')
-rw-r--r--gtk/gtkwidget.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 8bc8c07836..afe982a25f 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -12099,7 +12099,6 @@ gtk_widget_real_get_accessible (GtkWidget *widget)
else
{
accessible = g_object_new (priv->accessible_type, NULL);
-
if (priv->accessible_role != ATK_ROLE_INVALID)
atk_object_set_role (accessible, priv->accessible_role);
@@ -12108,6 +12107,13 @@ gtk_widget_real_get_accessible (GtkWidget *widget)
accessible);
atk_object_initialize (accessible, widget);
+
+ /* Set the role again, since we don't want a role set
+ * in some parent initialize() function to override
+ * our own.
+ */
+ if (priv->accessible_role != ATK_ROLE_INVALID)
+ atk_object_set_role (accessible, priv->accessible_role);
}
}
return accessible;