[gtk/abolish-destroy: 21/23] container: Use dispose instead of destroy
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/abolish-destroy: 21/23] container: Use dispose instead of destroy
- Date: Tue, 5 May 2020 21:02:39 +0000 (UTC)
commit 858049e8cd4ccf551fa94c2a75e75df8c4e040c5
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 5 16:52:02 2020 -0400
container: Use dispose instead of destroy
The destroy vfunc is going away.
gtk/gtkcontainer.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 38ef0b1399..43c5e7d1e4 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -91,7 +91,7 @@ enum {
};
/* --- prototypes --- */
-static void gtk_container_destroy (GtkWidget *widget);
+static void gtk_container_dispose (GObject *object);
static void gtk_container_add_unimplemented (GtkContainer *container,
GtkWidget *widget);
static void gtk_container_remove_unimplemented (GtkContainer *container,
@@ -119,7 +119,8 @@ gtk_container_class_init (GtkContainerClass *class)
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
- widget_class->destroy = gtk_container_destroy;
+ gobject_class->dispose = gtk_container_dispose;
+
widget_class->compute_expand = gtk_container_compute_expand;
widget_class->get_request_mode = gtk_container_get_request_mode;
widget_class->grab_focus = gtk_widget_grab_focus_none;
@@ -222,13 +223,13 @@ gtk_container_init (GtkContainer *container)
}
static void
-gtk_container_destroy (GtkWidget *widget)
+gtk_container_dispose (GObject *object)
{
- GtkContainer *container = GTK_CONTAINER (widget);
+ GtkContainer *container = GTK_CONTAINER (object);
gtk_container_foreach (container, (GtkCallback) gtk_widget_destroy, NULL);
- GTK_WIDGET_CLASS (gtk_container_parent_class)->destroy (widget);
+ G_OBJECT_CLASS (gtk_container_parent_class)->dispose (object);
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]