diff options
| author | Jonathan Blandford <jrb@redhat.com> | 2001-10-09 22:24:23 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2001-10-09 22:24:23 +0000 |
| commit | 36f914f02d200f96848a98868fcc53ccf50e799c (patch) | |
| tree | db44f4dd732549a71d310ddbe26f6de69166ec9e /gtk/gtkliststore.c | |
| parent | 59b95e91e1cb20a646f69d019ebf0e661dd60a63 (diff) | |
| download | gtk+-36f914f02d200f96848a98868fcc53ccf50e799c.tar.gz | |
We're a gobject, not a GtkObject. Thanks andersca.
Tue Oct 9 17:40:24 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_finalize): We're a gobject,
not a GtkObject. Thanks andersca.
* gtk/gtkliststore.c (gtk_list_store_finalize): ditto
Diffstat (limited to 'gtk/gtkliststore.c')
| -rw-r--r-- | gtk/gtkliststore.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index c7d79c5b89..01861e222a 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -35,7 +35,6 @@ static void gtk_list_store_tree_model_init (GtkTreeModelIface *iface); static void gtk_list_store_drag_source_init(GtkTreeDragSourceIface *iface); static void gtk_list_store_drag_dest_init (GtkTreeDragDestIface *iface); static void gtk_list_store_sortable_init (GtkTreeSortableIface *iface); -static void gtk_list_store_destroy (GtkObject *gobject); static void gtk_list_store_finalize (GObject *object); static guint gtk_list_store_get_flags (GtkTreeModel *tree_model); static gint gtk_list_store_get_n_columns (GtkTreeModel *tree_model); @@ -113,6 +112,8 @@ static void gtk_list_store_set_default_sort_func (GtkTreeSortable *so static gboolean gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable); +static GObjectClass *parent_class = NULL; + static void validate_list_store (GtkListStore *list_store) @@ -195,13 +196,11 @@ static void gtk_list_store_class_init (GtkListStoreClass *class) { GObjectClass *object_class; - GtkObjectClass *gobject_class; + parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - gobject_class = (GtkObjectClass*) class; object_class->finalize = gtk_list_store_finalize; - gobject_class->destroy = gtk_list_store_destroy; } static void @@ -396,19 +395,14 @@ gtk_list_store_finalize (GObject *object) _gtk_tree_data_list_header_free (list_store->sort_list); g_free (list_store->column_headers); -} - -static void -gtk_list_store_destroy (GtkObject *gobject) -{ - GtkListStore *list_store = GTK_LIST_STORE (gobject); - if (list_store->default_sort_destroy) { (* list_store->default_sort_destroy) (list_store->default_sort_data); list_store->default_sort_destroy = NULL; list_store->default_sort_data = NULL; } + + (* parent_class->finalize) (object); } /* Fulfill the GtkTreeModel requirements */ |