AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-14 20:51:07 +00:00
Code Issues Projects Releases Wiki Activity

container: Use dispose instead of destroy

Browse Source 
The destroy vfunc is going away.
This commit is contained in:
Matthias Clasen 2020-05-05 16:52:02 -04:00
parent d03b1524e6
commit 1086acce92
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkcontainer.c
View File

@ -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);
}
/**