[gtk/wip/baedert/for-master] actionbar: Stop implementing destroy()



commit a456523d530edc307f555e583221c9edb701d10e
Author: Timm Bäder <mail baedert org>
Date:   Wed Oct 2 13:22:01 2019 +0200

    actionbar: Stop implementing destroy()

 gtk/gtkactionbar.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c
index d8ad859778..35875ffb68 100644
--- a/gtk/gtkactionbar.c
+++ b/gtk/gtkactionbar.c
@@ -220,9 +220,9 @@ gtk_action_bar_get_property (GObject    *object,
 }
 
 static void
-gtk_action_bar_destroy (GtkWidget *widget)
+gtk_action_bar_dispose (GObject *object)
 {
-  GtkActionBar *self = GTK_ACTION_BAR (widget);
+  GtkActionBar *self = GTK_ACTION_BAR (object);
   GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (self);
 
   gtk_center_box_set_start_widget (GTK_CENTER_BOX (priv->center_box), NULL);
@@ -232,7 +232,7 @@ gtk_action_bar_destroy (GtkWidget *widget)
   priv->start_box = NULL;
   priv->end_box = NULL;
 
-  GTK_WIDGET_CLASS (gtk_action_bar_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (gtk_action_bar_parent_class)->dispose (object);
 }
 
 static void
@@ -248,11 +248,11 @@ gtk_action_bar_class_init (GtkActionBarClass *klass)
 
   object_class->set_property = gtk_action_bar_set_property;
   object_class->get_property = gtk_action_bar_get_property;
+  object_class->dispose = gtk_action_bar_dispose;
   object_class->finalize = gtk_action_bar_finalize;
 
   widget_class->size_allocate = gtk_action_bar_size_allocate;
   widget_class->measure = gtk_action_bar_measure_;
-  widget_class->destroy = gtk_action_bar_destroy;
 
   container_class->add = gtk_action_bar_add;
   container_class->remove = gtk_action_bar_remove;


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