[gtk/wip/baedert/for-master: 28/32] textview: Stop implementing destroy()



commit 6b9b4ed29695aab74ff9694170076a9d600a1e5f
Author: Timm Bäder <mail baedert org>
Date:   Wed Oct 2 13:29:27 2019 +0200

    textview: Stop implementing destroy()

 gtk/gtktextview.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index c82fcf792e..06fce2b818 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -360,7 +360,7 @@ static void gtk_text_view_get_property         (GObject         *object,
                                                guint            prop_id,
                                                GValue          *value,
                                                GParamSpec      *pspec);
-static void gtk_text_view_destroy              (GtkWidget        *widget);
+static void gtk_text_view_dispose              (GObject         *object);
 static void gtk_text_view_measure (GtkWidget      *widget,
                                    GtkOrientation  orientation,
                                    int             for_size,
@@ -693,9 +693,9 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    */
   gobject_class->set_property = gtk_text_view_set_property;
   gobject_class->get_property = gtk_text_view_get_property;
+  gobject_class->dispose = gtk_text_view_dispose;
   gobject_class->finalize = gtk_text_view_finalize;
 
-  widget_class->destroy = gtk_text_view_destroy;
   widget_class->realize = gtk_text_view_realize;
   widget_class->unrealize = gtk_text_view_unrealize;
   widget_class->map = gtk_text_view_map;
@@ -3537,12 +3537,12 @@ gtk_text_view_remove_validate_idles (GtkTextView *text_view)
 }
 
 static void
-gtk_text_view_destroy (GtkWidget *widget)
+gtk_text_view_dispose (GObject *object)
 {
   GtkTextView *text_view;
   GtkTextViewPrivate *priv;
 
-  text_view = GTK_TEXT_VIEW (widget);
+  text_view = GTK_TEXT_VIEW (object);
   priv = text_view->priv;
 
   gtk_text_view_remove_validate_idles (text_view);
@@ -3564,7 +3564,7 @@ gtk_text_view_destroy (GtkWidget *widget)
   if (priv->magnifier)
     _gtk_magnifier_set_inspected (GTK_MAGNIFIER (priv->magnifier), NULL);
 
-  GTK_WIDGET_CLASS (gtk_text_view_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (gtk_text_view_parent_class)->dispose (object);
 }
 
 static void


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