[gtk+] Fix more test breakage
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Fix more test breakage
- Date: Tue, 25 Oct 2011 11:39:47 +0000 (UTC)
commit df1e2cd128782c49f0cf0b6dbe6729edfce72be3
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Oct 14 15:52:24 2011 -0400
Fix more test breakage
gtk/gtkwidget.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 8bc8c07..afe982a 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]