From c8066bcd8b68737929d60636fde8fe03a9914e39 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 5 May 2020 16:49:20 -0400 Subject: [PATCH] spinbutton: Use dispose instead of destroy The destroy vfunc is going away. --- gtk/gtkspinbutton.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 0c790a6fff..43305ae9ce 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -261,6 +261,7 @@ enum static void gtk_spin_button_editable_init (GtkEditableInterface *iface); static void gtk_spin_button_cell_editable_init (GtkCellEditableIface *iface); static void gtk_spin_button_finalize (GObject *object); +static void gtk_spin_button_dispose (GObject *object); static void gtk_spin_button_set_property (GObject *object, guint prop_id, const GValue *value, @@ -269,7 +270,6 @@ static void gtk_spin_button_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gtk_spin_button_destroy (GtkWidget *widget); static void gtk_spin_button_realize (GtkWidget *widget); static void gtk_spin_button_grab_notify (GtkWidget *widget, gboolean was_grabbed); @@ -341,10 +341,10 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class) GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); gobject_class->finalize = gtk_spin_button_finalize; + gobject_class->dispose = gtk_spin_button_dispose; gobject_class->set_property = gtk_spin_button_set_property; gobject_class->get_property = gtk_spin_button_get_property; - widget_class->destroy = gtk_spin_button_destroy; widget_class->realize = gtk_spin_button_realize; widget_class->grab_notify = gtk_spin_button_grab_notify; widget_class->state_flags_changed = gtk_spin_button_state_flags_changed; @@ -1008,11 +1008,11 @@ gtk_spin_button_finalize (GObject *object) } static void -gtk_spin_button_destroy (GtkWidget *widget) +gtk_spin_button_dispose (GObject *object) { - gtk_spin_button_stop_spinning (GTK_SPIN_BUTTON (widget)); + gtk_spin_button_stop_spinning (GTK_SPIN_BUTTON (object)); - GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->destroy (widget); + G_OBJECT_CLASS (gtk_spin_button_parent_class)->dispose (object); } static void