diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-05-05 16:47:36 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-05-05 18:23:53 -0400 |
| commit | 1b44a64ef7ca73e76a84f0ffca309d75ce2dbba9 (patch) | |
| tree | 8bcea067e67d58212a9883e514bdd3f6976f7ef6 /gtk/gtkexpander.c | |
| parent | 37e381e95d3dc1bf9902f5c2b17a982d7111b9ae (diff) | |
| download | gtk+-1b44a64ef7ca73e76a84f0ffca309d75ce2dbba9.tar.gz | |
expander: Use dispose instead of destroy
The destroy vfunc is going away.
Diffstat (limited to 'gtk/gtkexpander.c')
| -rw-r--r-- | gtk/gtkexpander.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 0cd753fe01..c4d9cb139c 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -171,6 +171,7 @@ struct _GtkExpanderClass void (* activate) (GtkExpander *expander); }; +static void gtk_expander_dispose (GObject *object); static void gtk_expander_set_property (GObject *object, guint prop_id, const GValue *value, @@ -180,7 +181,6 @@ static void gtk_expander_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void gtk_expander_destroy (GtkWidget *widget); static void gtk_expander_size_allocate (GtkWidget *widget, int width, int height, @@ -286,10 +286,10 @@ gtk_expander_class_init (GtkExpanderClass *klass) widget_class = (GtkWidgetClass *) klass; container_class = (GtkContainerClass *) klass; + gobject_class->dispose = gtk_expander_dispose; gobject_class->set_property = gtk_expander_set_property; gobject_class->get_property = gtk_expander_get_property; - widget_class->destroy = gtk_expander_destroy; widget_class->size_allocate = gtk_expander_size_allocate; widget_class->focus = gtk_expander_focus; widget_class->grab_focus = gtk_widget_grab_focus_self; @@ -505,9 +505,9 @@ gtk_expander_get_property (GObject *object, } static void -gtk_expander_destroy (GtkWidget *widget) +gtk_expander_dispose (GObject *object) { - GtkExpander *expander = GTK_EXPANDER (widget); + GtkExpander *expander = GTK_EXPANDER (object); if (expander->expand_timer) { @@ -524,7 +524,7 @@ gtk_expander_destroy (GtkWidget *widget) expander->arrow_widget = NULL; } - GTK_WIDGET_CLASS (gtk_expander_parent_class)->destroy (widget); + G_OBJECT_CLASS (gtk_expander_parent_class)->dispose (object); } static void |