[gtk/abolish-destroy: 17/23] treeview: Use dispose instead of destroy
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/abolish-destroy: 17/23] treeview: Use dispose instead of destroy
- Date: Tue, 5 May 2020 21:02:18 +0000 (UTC)
commit 749a86f8894a87219c95cbc048e190551d04e673
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 5 16:51:16 2020 -0400
treeview: Use dispose instead of destroy
The destroy vfunc is going away.
gtk/gtktreeview.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 9d192086a1..b8f8bfeb9d 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -631,6 +631,7 @@ enum {
/* object signals */
static void gtk_tree_view_finalize (GObject *object);
+static void gtk_tree_view_dispose (GObject *object);
static void gtk_tree_view_set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -641,7 +642,6 @@ static void gtk_tree_view_get_property (GObject *object,
GParamSpec *pspec);
/* gtkwidget signals */
-static void gtk_tree_view_destroy (GtkWidget *widget);
static void gtk_tree_view_realize (GtkWidget *widget);
static void gtk_tree_view_unrealize (GtkWidget *widget);
static void gtk_tree_view_map (GtkWidget *widget);
@@ -1015,9 +1015,9 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
o_class->set_property = gtk_tree_view_set_property;
o_class->get_property = gtk_tree_view_get_property;
o_class->finalize = gtk_tree_view_finalize;
+ o_class->dispose = gtk_tree_view_dispose;
/* GtkWidget signals */
- widget_class->destroy = gtk_tree_view_destroy;
widget_class->map = gtk_tree_view_map;
widget_class->realize = gtk_tree_view_realize;
widget_class->unrealize = gtk_tree_view_unrealize;
@@ -2078,9 +2078,9 @@ gtk_tree_view_destroy_search_popover (GtkTreeView *tree_view)
}
static void
-gtk_tree_view_destroy (GtkWidget *widget)
+gtk_tree_view_dispose (GObject *object)
{
- GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
+ GtkTreeView *tree_view = GTK_TREE_VIEW (object);
GList *list;
gtk_tree_view_stop_editing (tree_view, TRUE);
@@ -2187,7 +2187,7 @@ gtk_tree_view_destroy (GtkWidget *widget)
g_clear_object (&tree_view->horizontal_tree_line_texture);
g_clear_object (&tree_view->vertical_tree_line_texture);
- GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->destroy (widget);
+ G_OBJECT_CLASS (gtk_tree_view_parent_class)->dispose (object);
}
/* GtkWidget::map helper */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]