diff options
| author | Timm Bäder <mail@baedert.org> | 2017-01-28 08:11:14 +0100 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2017-01-30 18:11:00 +0100 |
| commit | 2aea8dfee97b514e1fca7f577fefdac4e449e906 (patch) | |
| tree | 360d39b86a452010535d60769109fe3dd1ac2d8e /gtk/a11y | |
| parent | 66d584ce6e298a016e90a80091a5fc1f6f07ff2f (diff) | |
| download | gtk+-2aea8dfee97b514e1fca7f577fefdac4e449e906.tar.gz | |
togglebutton: Move :inconsistent to GtkCheckButton
Diffstat (limited to 'gtk/a11y')
| -rw-r--r-- | gtk/a11y/gtktogglebuttonaccessible.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/gtk/a11y/gtktogglebuttonaccessible.c b/gtk/a11y/gtktogglebuttonaccessible.c index 8b85f27bb8..761b43d56d 100644 --- a/gtk/a11y/gtktogglebuttonaccessible.c +++ b/gtk/a11y/gtktogglebuttonaccessible.c @@ -56,22 +56,15 @@ gtk_toggle_button_accessible_notify_gtk (GObject *obj, GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (obj); AtkObject *atk_obj; gboolean sensitive; - gboolean inconsistent; atk_obj = gtk_widget_get_accessible (GTK_WIDGET (toggle_button)); sensitive = gtk_widget_get_sensitive (GTK_WIDGET (toggle_button)); - inconsistent = gtk_toggle_button_get_inconsistent (toggle_button); - if (strcmp (pspec->name, "inconsistent") == 0) - { - 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) + if (strcmp (pspec->name, "sensitive") == 0) { /* Need to override gailwidget behavior of notifying for ENABLED */ atk_object_notify_state_change (atk_obj, ATK_STATE_SENSITIVE, sensitive); - atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); + atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, sensitive); } else GTK_WIDGET_ACCESSIBLE_CLASS (gtk_toggle_button_accessible_parent_class)->notify_gtk (obj, pspec); @@ -94,12 +87,6 @@ gtk_toggle_button_accessible_ref_state_set (AtkObject *accessible) if (gtk_toggle_button_get_active (toggle_button)) atk_state_set_add_state (state_set, ATK_STATE_CHECKED); - if (gtk_toggle_button_get_inconsistent (toggle_button)) - { - atk_state_set_remove_state (state_set, ATK_STATE_ENABLED); - atk_state_set_add_state (state_set, ATK_STATE_INDETERMINATE); - } - return state_set; } |