 b7e41a7eda
			
		
	
	b7e41a7eda
	
	
	
		
			
			Just as for GtkRangeAccessible, we were not even trying to disconnect the signal handler from the adjustment. The same fix works here: override the widget_set and widget_unset vfuncs. https://bugzilla.gnome.org/show_bug.cgi?id=705692
		
			
				
	
	
		
			217 lines
		
	
	
		
			6.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			217 lines
		
	
	
		
			6.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* GTK+ - accessibility implementations
 | |
|  * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
 | |
|  *
 | |
|  * This library is free software; you can redistribute it and/or
 | |
|  * modify it under the terms of the GNU Lesser General Public
 | |
|  * License as published by the Free Software Foundation; either
 | |
|  * version 2 of the License, or (at your option) any later version.
 | |
|  *
 | |
|  * This library is distributed in the hope that it will be useful,
 | |
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|  * Lesser General Public License for more details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU Lesser General Public
 | |
|  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 | |
|  */
 | |
| 
 | |
| #include "config.h"
 | |
| 
 | |
| #include <string.h>
 | |
| #include <gtk/gtk.h>
 | |
| #include "gtkspinbuttonaccessible.h"
 | |
| 
 | |
| struct _GtkSpinButtonAccessiblePrivate
 | |
| {
 | |
|   GtkAdjustment *adjustment;
 | |
| };
 | |
| 
 | |
| static void atk_value_interface_init (AtkValueIface *iface);
 | |
| 
 | |
| G_DEFINE_TYPE_WITH_CODE (GtkSpinButtonAccessible, gtk_spin_button_accessible, GTK_TYPE_ENTRY_ACCESSIBLE,
 | |
|                          G_ADD_PRIVATE (GtkSpinButtonAccessible)
 | |
|                          G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_value_changed (GtkAdjustment *adjustment,
 | |
|                                           gpointer       data)
 | |
| {
 | |
|   g_object_notify (G_OBJECT (data), "accessible-value");
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_widget_set (GtkAccessible *accessible)
 | |
| {
 | |
|   GtkSpinButtonAccessiblePrivate *priv = GTK_SPIN_BUTTON_ACCESSIBLE (accessible)->priv;
 | |
|   GtkWidget *spin;
 | |
|   GtkAdjustment *adj;
 | |
| 
 | |
|   spin = gtk_accessible_get_widget (accessible);
 | |
|   adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (spin));
 | |
|   if (adj)
 | |
|     {
 | |
|       priv->adjustment = adj;
 | |
|       g_object_ref (priv->adjustment);
 | |
|       g_signal_connect (priv->adjustment, "value-changed",
 | |
|                         G_CALLBACK (gtk_spin_button_accessible_value_changed),
 | |
|                         accessible);
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_widget_unset (GtkAccessible *accessible)
 | |
| {
 | |
|   GtkSpinButtonAccessiblePrivate *priv = GTK_SPIN_BUTTON_ACCESSIBLE (accessible)->priv;
 | |
| 
 | |
|   if (priv->adjustment)
 | |
|     {
 | |
|       g_signal_handlers_disconnect_by_func (priv->adjustment,
 | |
|                                             G_CALLBACK (gtk_spin_button_accessible_value_changed),
 | |
|                                             accessible);
 | |
|       g_object_unref (priv->adjustment);
 | |
|       priv->adjustment = NULL;
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_initialize (AtkObject *obj,
 | |
|                                        gpointer  data)
 | |
| {
 | |
|   ATK_OBJECT_CLASS (gtk_spin_button_accessible_parent_class)->initialize (obj, data);
 | |
|   obj->role = ATK_ROLE_SPIN_BUTTON;
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_notify_gtk (GObject    *obj,
 | |
|                                        GParamSpec *pspec)
 | |
| {
 | |
|   GtkWidget *widget = GTK_WIDGET (obj);
 | |
|   AtkObject *spin;
 | |
| 
 | |
|   if (strcmp (pspec->name, "adjustment") == 0)
 | |
|     {
 | |
|       spin = gtk_widget_get_accessible (widget);
 | |
|       gtk_spin_button_accessible_widget_unset (GTK_ACCESSIBLE (spin));
 | |
|       gtk_spin_button_accessible_widget_set (GTK_ACCESSIBLE (spin));
 | |
| 
 | |
|     }
 | |
|   else
 | |
|     GTK_WIDGET_ACCESSIBLE_CLASS (gtk_spin_button_accessible_parent_class)->notify_gtk (obj, pspec);
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass)
 | |
| {
 | |
|   AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
 | |
|   GtkAccessibleClass *accessible_class = (GtkAccessibleClass*)klass;
 | |
|   GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
 | |
| 
 | |
|   class->initialize = gtk_spin_button_accessible_initialize;
 | |
| 
 | |
|   accessible_class->widget_set = gtk_spin_button_accessible_widget_set;
 | |
|   accessible_class->widget_unset = gtk_spin_button_accessible_widget_unset;
 | |
| 
 | |
|   widget_class->notify_gtk = gtk_spin_button_accessible_notify_gtk;
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_init (GtkSpinButtonAccessible *button)
 | |
| {
 | |
|   button->priv = gtk_spin_button_accessible_get_instance_private (button);
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_get_current_value (AtkValue *obj,
 | |
|                                               GValue   *value)
 | |
| {
 | |
|   GtkWidget *widget;
 | |
|   GtkAdjustment *adjustment;
 | |
| 
 | |
|   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
 | |
|   adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
 | |
|   if (adjustment == NULL)
 | |
|     return;
 | |
| 
 | |
|   memset (value,  0, sizeof (GValue));
 | |
|   g_value_init (value, G_TYPE_DOUBLE);
 | |
|   g_value_set_double (value, gtk_adjustment_get_value (adjustment));
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_get_maximum_value (AtkValue *obj,
 | |
|                                               GValue   *value)
 | |
| {
 | |
|   GtkWidget *widget;
 | |
|   GtkAdjustment *adjustment;
 | |
| 
 | |
|   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
 | |
|   adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
 | |
|   if (adjustment == NULL)
 | |
|     return;
 | |
| 
 | |
|   memset (value,  0, sizeof (GValue));
 | |
|   g_value_init (value, G_TYPE_DOUBLE);
 | |
|   g_value_set_double (value, gtk_adjustment_get_upper (adjustment));
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_get_minimum_value (AtkValue *obj,
 | |
|                                               GValue   *value)
 | |
| {
 | |
|   GtkWidget *widget;
 | |
|   GtkAdjustment *adjustment;
 | |
| 
 | |
|   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
 | |
|   adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
 | |
|   if (adjustment == NULL)
 | |
|     return;
 | |
| 
 | |
|   memset (value,  0, sizeof (GValue));
 | |
|   g_value_init (value, G_TYPE_DOUBLE);
 | |
|   g_value_set_double (value, gtk_adjustment_get_lower (adjustment));
 | |
| }
 | |
| 
 | |
| static void
 | |
| gtk_spin_button_accessible_get_minimum_increment (AtkValue *obj,
 | |
|                                                   GValue   *value)
 | |
| {
 | |
|   GtkWidget *widget;
 | |
|   GtkAdjustment *adjustment;
 | |
| 
 | |
|   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
 | |
|   adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
 | |
|   if (adjustment == NULL)
 | |
|     return;
 | |
| 
 | |
|   memset (value,  0, sizeof (GValue));
 | |
|   g_value_init (value, G_TYPE_DOUBLE);
 | |
|   g_value_set_double (value, gtk_adjustment_get_minimum_increment (adjustment));
 | |
| }
 | |
| 
 | |
| static gboolean
 | |
| gtk_spin_button_accessible_set_current_value (AtkValue     *obj,
 | |
|                                               const GValue *value)
 | |
| {
 | |
|   GtkWidget *widget;
 | |
|   GtkAdjustment *adjustment;
 | |
| 
 | |
|   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
 | |
|   adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
 | |
|   if (adjustment == NULL)
 | |
|     return FALSE;
 | |
| 
 | |
|   gtk_adjustment_set_value (adjustment, g_value_get_double (value));
 | |
| 
 | |
|   return TRUE;
 | |
| }
 | |
| 
 | |
| static void
 | |
| atk_value_interface_init (AtkValueIface *iface)
 | |
| {
 | |
|   iface->get_current_value = gtk_spin_button_accessible_get_current_value;
 | |
|   iface->get_maximum_value = gtk_spin_button_accessible_get_maximum_value;
 | |
|   iface->get_minimum_value = gtk_spin_button_accessible_get_minimum_value;
 | |
|   iface->get_minimum_increment = gtk_spin_button_accessible_get_minimum_increment;
 | |
|   iface->set_current_value = gtk_spin_button_accessible_set_current_value;
 | |
| }
 |