From 2ae8a27b4ac26f1a843b0c541d801e3f1cc0d8e0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 4 Feb 2013 00:59:14 -0500 Subject: [PATCH] Remove a no-op AtkAction from GtkRange The "activate" action here did not do anything. It is possible we actually want to have some actions here, like "step-up", "step-down", "page-up", "page-down", etc. For now, just remove the AtkAction implementation. https://bugzilla.gnome.org/show_bug.cgi?id=553334 --- gtk/a11y/gtkrangeaccessible.c | 94 ----------------------------------- 1 file changed, 94 deletions(-) diff --git a/gtk/a11y/gtkrangeaccessible.c b/gtk/a11y/gtkrangeaccessible.c index be9c371fae..b3ccacb921 100644 --- a/gtk/a11y/gtkrangeaccessible.c +++ b/gtk/a11y/gtkrangeaccessible.c @@ -22,11 +22,9 @@ #include "gtkrangeaccessible.h" -static void atk_action_interface_init (AtkActionIface *iface); static void atk_value_interface_init (AtkValueIface *iface); G_DEFINE_TYPE_WITH_CODE (GtkRangeAccessible, gtk_range_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, - G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) static void @@ -221,95 +219,3 @@ atk_value_interface_init (AtkValueIface *iface) iface->get_minimum_increment = gtk_range_accessible_get_minimum_increment; iface->set_current_value = gtk_range_accessible_set_current_value; } - -static gboolean -gtk_range_accessible_do_action (AtkAction *action, - gint i) -{ - GtkWidget *widget; - - widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (action)); - if (widget == NULL) - return FALSE; - - if (!gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget)) - return FALSE; - - if (i != 0) - return FALSE; - - gtk_widget_activate (widget); - - return TRUE; -} - -static gint -gtk_range_accessible_get_n_actions (AtkAction *action) -{ - return 1; -} - -static const gchar * -gtk_range_accessible_get_keybinding (AtkAction *action, - gint i) -{ - GtkRangeAccessible *range = GTK_RANGE_ACCESSIBLE (action); - GtkWidget *widget; - GtkWidget *label; - AtkRelationSet *set; - AtkRelation *relation; - GPtrArray *target; - gpointer target_object; - guint key_val; - gchar *return_value = NULL; - - if (i != 0) - return NULL; - - widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (range)); - if (widget == NULL) - return NULL; - - set = atk_object_ref_relation_set (ATK_OBJECT (action)); - - if (!set) - return NULL; - - label = NULL; - relation = atk_relation_set_get_relation_by_type (set, ATK_RELATION_LABELLED_BY); - if (relation) - { - target = atk_relation_get_target (relation); - target_object = g_ptr_array_index (target, 0); - label = gtk_accessible_get_widget (GTK_ACCESSIBLE (target_object)); - } - g_object_unref (set); - - if (GTK_IS_LABEL (label)) - { - key_val = gtk_label_get_mnemonic_keyval (GTK_LABEL (label)); - if (key_val != GDK_KEY_VoidSymbol) - return_value = gtk_accelerator_name (key_val, GDK_MOD1_MASK); - } - - return return_value; -} - -static const gchar * -gtk_range_accessible_action_get_name (AtkAction *action, - gint i) -{ - if (i != 0) - return NULL; - - return "activate"; -} - -static void -atk_action_interface_init (AtkActionIface *iface) -{ - iface->do_action = gtk_range_accessible_do_action; - iface->get_n_actions = gtk_range_accessible_get_n_actions; - iface->get_keybinding = gtk_range_accessible_get_keybinding; - iface->get_name = gtk_range_accessible_action_get_name; -}