[gtk/abolish-destroy: 10/23] range: Use dispose instead of destroy



commit 326326dafccb944a76fde70573baf00be181c7c4
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue May 5 16:49:33 2020 -0400

    range: Use dispose instead of destroy
    
    The destroy vfunc is going away.

 gtk/gtkrange.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index d6995fce4c..95c728a4fe 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -148,7 +148,7 @@ static void gtk_range_get_property   (GObject          *object,
                                       GValue           *value,
                                       GParamSpec       *pspec);
 static void gtk_range_finalize       (GObject          *object);
-static void gtk_range_destroy        (GtkWidget        *widget);
+static void gtk_range_dispose        (GObject          *object);
 static void gtk_range_measure        (GtkWidget      *widget,
                                       GtkOrientation  orientation,
                                       int             for_size,
@@ -271,8 +271,8 @@ gtk_range_class_init (GtkRangeClass *class)
   gobject_class->set_property = gtk_range_set_property;
   gobject_class->get_property = gtk_range_get_property;
   gobject_class->finalize = gtk_range_finalize;
+  gobject_class->dispose = gtk_range_dispose;
 
-  widget_class->destroy = gtk_range_destroy;
   widget_class->measure = gtk_range_measure;
   widget_class->snapshot = gtk_range_snapshot;
   widget_class->size_allocate = gtk_range_size_allocate;
@@ -1256,9 +1256,9 @@ gtk_range_get_fill_level (GtkRange *range)
 }
 
 static void
-gtk_range_destroy (GtkWidget *widget)
+gtk_range_dispose (GObject *object)
 {
-  GtkRange *range = GTK_RANGE (widget);
+  GtkRange *range = GTK_RANGE (object);
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
 
   gtk_range_remove_step_timer (range);
@@ -1284,7 +1284,7 @@ gtk_range_destroy (GtkWidget *widget)
       priv->n_marks = 0;
     }
 
-  GTK_WIDGET_CLASS (gtk_range_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (gtk_range_parent_class)->dispose (object);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]