[gtk+/gtk-3-2] Fix more test breakage
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-2] Fix more test breakage
- Date: Fri, 14 Oct 2011 19:53:06 +0000 (UTC)
commit 4e99d8d090ee1575f2fd7278b1f1e0ab09b586a7
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 6382205..d5c689c 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -12100,7 +12100,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);
@@ -12109,6 +12108,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]