Actually use the AccessibleRange interface

diff --git a/gtk/a11y/gtkatspivalue.c b/gtk/a11y/gtkatspivalue.c
index 269d27e61aff018b68010a056b9706f20a72c3d5..404121065ae3b72edf7602ed3f1a9a5d59c2f271 100644 (file)
--- a/gtk/a11y/gtkatspivalue.c
+++ b/gtk/a11y/gtkatspivalue.c
@@ -24,14 +24,9 @@
 
 #include "a11y/atspi/atspi-value.h"
 
+#include "gtkaccessiblerange.h"
 #include "gtkatcontextprivate.h"
 #include "gtkdebug.h"
-#include "gtklevelbar.h"
-#include "gtkpaned.h"
-#include "gtkprogressbar.h"
-#include "gtkrange.h"
-#include "gtkscalebutton.h"
-#include "gtkspinbutton.h"
 
 #include <gio/gio.h>
 
@@ -69,7 +64,12 @@ handle_value_get_property (GDBusConnection  *connection,
         }
     }
 
-  /* fall back for a) MinimumIncrement b) widgets that should have the
+  if (g_strcmp0 (property_name, "MinimumIncrement") == 0)
+    {
+      GtkAccessibleRange *range = GTK_ACCESSIBLE_RANGE (gtk_at_context_get_accessible (ctx));
+      return g_variant_new_double(gtk_accessible_range_get_minimum_increment (range));
+  }
+  /* fall back for widgets that should have the
    * properties but don't
    */
   return g_variant_new_double (0.0);
@@ -86,22 +86,11 @@ handle_value_set_property (GDBusConnection  *connection,
                            gpointer          user_data)
 {
   GtkATContext *self = user_data;
-  GtkWidget *widget = GTK_WIDGET (gtk_at_context_get_accessible (self));
+  GtkAccessibleRange *range = GTK_ACCESSIBLE_RANGE (gtk_at_context_get_accessible (self));
 
   if (g_strcmp0 (property_name, "CurrentValue") == 0)
     {
-      /* we only allow setting values if that is part of the user-exposed
-       * functionality of the widget.
-       */
-      if (GTK_IS_RANGE (widget))
-        gtk_range_set_value (GTK_RANGE (widget), g_variant_get_double (value));
-      else if (GTK_IS_PANED (widget))
-        gtk_paned_set_position (GTK_PANED (widget), (int)(g_variant_get_double (value) + 0.5));
-      else if (GTK_IS_SPIN_BUTTON (widget))
-        gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), g_variant_get_double (value));
-      else if (GTK_IS_SCALE_BUTTON (widget))
-        gtk_scale_button_set_value (GTK_SCALE_BUTTON (widget), g_variant_get_double (value));
-      return TRUE;
+      return gtk_accessible_range_set_current_value (range, g_variant_get_double (value));
     }
 
   return FALSE;
@@ -116,12 +105,7 @@ static const GDBusInterfaceVTable value_vtable = {
 const GDBusInterfaceVTable *
 gtk_atspi_get_value_vtable (GtkAccessible *accessible)
 {
-  if (GTK_IS_LEVEL_BAR (accessible) ||
-      GTK_IS_PANED (accessible) ||
-      GTK_IS_PROGRESS_BAR (accessible) ||
-      GTK_IS_RANGE (accessible) ||
-      GTK_IS_SCALE_BUTTON (accessible) ||
-      GTK_IS_SPIN_BUTTON (accessible))
+  if (GTK_IS_ACCESSIBLE_RANGE (accessible))
     return &value_vtable;
 
   return NULL;

diff --git a/gtk/gtkaccessiblerange.c b/gtk/gtkaccessiblerange.c
index 7593012cf2e2800eaaf256ef772ad85c5cd5bffa..228899964f2afc4161298897f0f1c1438d2e669a 100644 (file)
--- a/gtk/gtkaccessiblerange.c
+++ b/gtk/gtkaccessiblerange.c
@@ -50,10 +50,10 @@ gtk_accessible_range_default_get_minimum_increment (GtkAccessibleRange *accessib
   return 0.0;\r
 }\r
 \r
-static void\r
+static gboolean\r
 gtk_accessible_range_default_set_current_value (GtkAccessibleRange *accessible_range, double value)\r
 {\r
-  /* By default, we do nothing */\r
+  return FALSE;\r
 }\r
 \r
 static void\r
@@ -87,12 +87,13 @@ gtk_accessible_range_get_minimum_increment (GtkAccessibleRange *self)
  * Note that for some widgets implementing this interface, setting a value\r
  * through the accessibility API makes no sense, so calling this function may\r
  * in some cases do nothing.\r
+ * @returns: %true if the call changed the value, %false otherwise\r
  */\r
-void\r
+gboolean\r
 gtk_accessible_range_set_current_value (GtkAccessibleRange *self, double value)\r
 {\r
-  g_return_if_fail (GTK_IS_ACCESSIBLE_RANGE (self));\r
+  g_return_val_if_fail (GTK_IS_ACCESSIBLE_RANGE (self), FALSE);\r
 \r
   GtkAccessibleRangeInterface *iface = GTK_ACCESSIBLE_RANGE_GET_IFACE (self);\r
-  iface->set_current_value (self, value);\r
+  return iface->set_current_value (self, value);\r
 }
\ No newline at end of file

diff --git a/gtk/gtkaccessiblerange.h b/gtk/gtkaccessiblerange.h
index 55da3d688c26191ac95e34d5a9aaae3a4e82bbec..317bcf39b973ce87d7902493ad86e44ba39fb99e 100644 (file)
--- a/gtk/gtkaccessiblerange.h
+++ b/gtk/gtkaccessiblerange.h
@@ -54,14 +54,15 @@ struct _GtkAccessibleRangeInterface
    * \r
    * Sets the current value of @self to @value.\r
    * This operation should behave similarly as if the user performed the action.\r
+   * @returns: %true if the operation was performed, %false otherwise\r
    */\r
-  void (* set_current_value) (GtkAccessibleRange *self, double value);\r
+  gboolean (* set_current_value) (GtkAccessibleRange *self, double value);\r
 };\r
 \r
 GDK_AVAILABLE_IN_ALL\r
 double gtk_accessible_range_get_minimum_increment (GtkAccessibleRange *self);\r
 \r
 GDK_AVAILABLE_IN_ALL\r
-void gtk_accessible_range_set_current_value (GtkAccessibleRange *self, double value);\r
+gboolean gtk_accessible_range_set_current_value (GtkAccessibleRange *self, double value);\r
 \r
 G_END_DECLS
\ No newline at end of file

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index c0ff043d2f2c15321bea1a30356792cec84ee111..9dc76360e65ad0a26e25202fc5b5cebe0c567e93 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -815,11 +815,12 @@ gtk_paned_accessible_range_get_minimum_increment (GtkAccessibleRange *accessible
   return 1.0;
 }
 
-static void
+static gboolean
 gtk_paned_accessible_range_set_current_value (GtkAccessibleRange *accessible_range, double value)
 {
   GtkPaned *paned = GTK_PANED (accessible_range);
   gtk_paned_set_position (paned, (int) value + 0.5);
+  return TRUE;
 }
 
 static void

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 53b852c6f547e3de8565c32314b4c3d8d0c7e04c..d38365c04aa1426176d1427a530bb4013dede4dd 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -447,11 +447,12 @@ gtk_range_accessible_range_get_minimum_increment (GtkAccessibleRange *accessible
   return gtk_adjustment_get_minimum_increment (gtk_range_get_adjustment (range));
 }
 
-static void
+static gboolean
 gtk_range_accessible_range_set_current_value (GtkAccessibleRange *accessible_range, double value)
 {
   GtkRange *range = GTK_RANGE (accessible_range);
   gtk_range_set_value (range, value);
+  return TRUE;
 }
 
 static void

diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index b97af7c4e805b2ba27701790ac257c344e4746f5..a81f0968f9f55de16e31be44286992bb5005dfac 100644 (file)
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -177,11 +177,12 @@ gtk_scale_button_accessible_range_get_minimum_increment(GtkAccessibleRange *acce
   return gtk_adjustment_get_minimum_increment (gtk_scale_button_get_adjustment (button));
 }
 
-static void
+static gboolean
 gtk_scale_button_accessible_range_set_current_value (GtkAccessibleRange *accessible_range, double value)
 {
   GtkScaleButton *button = GTK_SCALE_BUTTON (accessible_range);
   gtk_scale_button_set_value (button, value);
+  return TRUE;
 }
 
 static void

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index f9eb4a2f4509f9ebe31b78c78472023011d3d7ef..05b373fbbeb8b32a086ba30be6c27ded087c7ccd 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -644,11 +644,12 @@ gtk_spin_button_accessible_range_get_minimum_increment (GtkAccessibleRange *acce
   return gtk_adjustment_get_minimum_increment (gtk_spin_button_get_adjustment (button));
 }
 
-static void
+static gboolean
 gtk_spin_button_accessible_range_set_current_value (GtkAccessibleRange *accessible_range, double value)
 {
   GtkSpinButton *button = GTK_SPIN_BUTTON (accessible_range);
   gtk_spin_button_set_value (button, value);
+  return TRUE;
 }
 
 static void