diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-05-05 15:49:30 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-05-05 18:23:53 -0400 |
commit | e0f95844c1873078548030855564a32442a7fe44 (patch) | |
tree | aa24c7032294182392a87a1f279c0123c4f5473f /gtk/gtkactionbar.c | |
parent | 539f06147ab238c6186c63827f75ec6b7c84c2cc (diff) | |
download | gtk+-e0f95844c1873078548030855564a32442a7fe44.tar.gz |
actionbar: Use dispose instead of destroy
The destroy vfunc is going away.
Diffstat (limited to 'gtk/gtkactionbar.c')
-rw-r--r-- | gtk/gtkactionbar.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c index 5f3c6c2599..3435abb71c 100644 --- a/gtk/gtkactionbar.c +++ b/gtk/gtkactionbar.c @@ -181,9 +181,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); gtk_center_box_set_start_widget (GTK_CENTER_BOX (self->center_box), NULL); gtk_center_box_set_center_widget (GTK_CENTER_BOX (self->center_box), NULL); @@ -192,7 +192,7 @@ gtk_action_bar_destroy (GtkWidget *widget) self->start_box = NULL; self->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 @@ -208,10 +208,9 @@ 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->destroy = gtk_action_bar_destroy; - container_class->add = gtk_action_bar_add; container_class->remove = gtk_action_bar_remove; container_class->forall = gtk_action_bar_forall; |