[gtk+] Forgotten file
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Forgotten file
- Date: Thu, 17 Feb 2011 04:57:25 +0000 (UTC)
commit 292e23f5158cd4a4e2b6596413c2c4b9498ed366
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Feb 16 23:26:36 2011 -0500
Forgotten file
modules/other/gail/gailchecksubmenuitem.c | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/modules/other/gail/gailchecksubmenuitem.c b/modules/other/gail/gailchecksubmenuitem.c
index 97f0a7b..a9e22f5 100644
--- a/modules/other/gail/gailchecksubmenuitem.c
+++ b/modules/other/gail/gailchecksubmenuitem.c
@@ -119,7 +119,10 @@ gail_check_sub_menu_item_ref_state_set (AtkObject *accessible)
atk_state_set_add_state (state_set, ATK_STATE_CHECKED);
if (gtk_check_menu_item_get_inconsistent (check_menu_item))
- atk_state_set_remove_state (state_set, ATK_STATE_ENABLED);
+ {
+ atk_state_set_remove_state (state_set, ATK_STATE_ENABLED);
+ atk_state_set_add_state (state_set, ATK_STATE_INDETERMINATE);
+ }
return state_set;
}
@@ -130,23 +133,23 @@ gail_check_sub_menu_item_real_notify_gtk (GObject *obj,
{
GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (obj);
AtkObject *atk_obj;
+ gboolean sensitive;
+ gboolean inconsistent;
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (check_menu_item));
+ sensitive = gtk_widget_get_sensitive (GTK_WIDGET (check_menu_item));
+ inconsistent = gtk_check_menu_item_get_inconsistent (check_menu_item);
if (strcmp (pspec->name, "inconsistent") == 0)
- atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED,
- (gtk_widget_get_sensitive (GTK_WIDGET (check_menu_item)) &&
- !gtk_check_menu_item_get_inconsistent (check_menu_item)));
+ {
+ atk_object_notify_state_change (atk_obj, ATK_STATE_INDETERMINATE, inconsistent);
+ atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent));
+ }
else if (strcmp (pspec->name, "sensitive") == 0)
{
/* Need to override gailwidget behavior of notifying for ENABLED */
- gboolean sensitive;
- gboolean enabled;
- sensitive = gtk_widget_get_sensitive (GTK_WIDGET (check_menu_item));
- enabled = sensitive &&
- !gtk_check_menu_item_get_inconsistent (check_menu_item);
- atk_object_notify_state_change (atk_obj, ATK_STATE_SENSITIVE, sensitive);
- atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, enabled);
+ atk_object_notify_state_change (atk_obj, ATK_STATE_SENSITIVE, sensitive);
+ atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent));
}
else
GAIL_WIDGET_CLASS (gail_check_sub_menu_item_parent_class)->notify_gtk (obj, pspec);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]