From b99389bcb89ed3b71008c23e480d2a33eb7d0814 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 5 Jun 2020 20:31:11 +0100 Subject: [PATCH] a11y: Drop GtkWidgetAccessibleClass.notify_gtk It's finally unused. Accessible types should either watch properties they are interested in directly, or should have (private) API to allow widgets to update the accessible state directly. --- gtk/a11y/gtkwidgetaccessible.c | 26 -------------------------- gtk/a11y/gtkwidgetaccessible.h | 7 ------- 2 files changed, 33 deletions(-) diff --git a/gtk/a11y/gtkwidgetaccessible.c b/gtk/a11y/gtkwidgetaccessible.c index 0a9a749e08..fe334e3d8b 100644 --- a/gtk/a11y/gtkwidgetaccessible.c +++ b/gtk/a11y/gtkwidgetaccessible.c @@ -179,33 +179,16 @@ gtk_widget_accessible_notify_orientation (GtkWidgetAccessible *self) } } -static void -notify_cb (GObject *gobject, - GParamSpec *pspec, - gpointer user_data) -{ - GtkWidget *widget = GTK_WIDGET (gobject); - GtkWidgetAccessible *self = user_data; - - GTK_WIDGET_ACCESSIBLE_GET_CLASS (self)->notify_gtk (G_OBJECT (widget), pspec); -} - static void gtk_widget_accessible_initialize (AtkObject *object, gpointer data) { GtkWidgetAccessible *self = GTK_WIDGET_ACCESSIBLE (object); GtkWidgetAccessiblePrivate *priv = gtk_widget_accessible_get_instance_private (self); - GtkWidget *widget = data; priv->layer = ATK_LAYER_WIDGET; atk_object_set_role (object, ATK_ROLE_UNKNOWN); - - /* XXX: This will go away once we move all GtkWidgetAccessibleClass.notify_gtk() - * implementations to explicit API on their respective classes - */ - g_signal_connect (widget, "notify", G_CALLBACK (notify_cb), self); } static const char * @@ -586,20 +569,11 @@ gtk_widget_accessible_ref_child (AtkObject *object, return NULL; } -static void -gtk_widget_accessible_notify_gtk (GObject *gobject, - GParamSpec *pspec) -{ - /* Empty, used to chain up safely */ -} - static void gtk_widget_accessible_class_init (GtkWidgetAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); - klass->notify_gtk = gtk_widget_accessible_notify_gtk; - class->get_description = gtk_widget_accessible_get_description; class->get_parent = gtk_widget_accessible_get_parent; class->ref_relation_set = gtk_widget_accessible_ref_relation_set; diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h index c58aac4b4e..fd4e02654e 100644 --- a/gtk/a11y/gtkwidgetaccessible.h +++ b/gtk/a11y/gtkwidgetaccessible.h @@ -34,13 +34,6 @@ G_DECLARE_DERIVABLE_TYPE (GtkWidgetAccessible, gtk_widget_accessible, GTK, WIDGE struct _GtkWidgetAccessibleClass { GtkAccessibleClass parent_class; - - /* - * Signal handler for notify signal on GTK widget - */ - void (*notify_gtk) (GObject *object, - GParamSpec *pspec); - }; G_END_DECLS