[gtk/abolish-destroy: 13/30] modelbutton: Use dispose instead of destroy
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/abolish-destroy: 13/30] modelbutton: Use dispose instead of destroy
- Date: Tue, 5 May 2020 23:57:40 +0000 (UTC)
commit 8683925fe0abc33ad69ecb84e9b3fad02bd9007d
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 5 16:48:39 2020 -0400
modelbutton: Use dispose instead of destroy
The destroy vfunc is going away.
gtk/gtkmodelbutton.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 61b9e3a955..1579c1335f 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -932,13 +932,13 @@ gtk_model_button_set_property (GObject *object,
}
static void
-gtk_model_button_destroy (GtkWidget *widget)
+gtk_model_button_dispose (GObject *object)
{
- GtkModelButton *model_button = GTK_MODEL_BUTTON (widget);
+ GtkModelButton *model_button = GTK_MODEL_BUTTON (object);
g_clear_pointer (&model_button->menu_name, g_free);
- GTK_WIDGET_CLASS (gtk_model_button_parent_class)->destroy (widget);
+ G_OBJECT_CLASS (gtk_model_button_parent_class)->dispose (object);
}
static void
@@ -1084,11 +1084,11 @@ gtk_model_button_class_init (GtkModelButtonClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+ object_class->dispose = gtk_model_button_dispose;
object_class->finalize = gtk_model_button_finalize;
object_class->get_property = gtk_model_button_get_property;
object_class->set_property = gtk_model_button_set_property;
- widget_class->destroy = gtk_model_button_destroy;
widget_class->state_flags_changed = gtk_model_button_state_flags_changed;
widget_class->direction_changed = gtk_model_button_direction_changed;
widget_class->focus = gtk_model_button_focus;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]