From f8172191adf212f4829e05be6a224c13e10b898c Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Tue, 5 Nov 2002 15:05:25 +0000 Subject: use GObject api for models GObjectify GObjectify GObjectify GObjectify 2002-11-05 Mike Kestner * e-table-item.c : use GObject api for models * e-table-memory-callbacks.[ch] : GObjectify * e-table-memory-store.[ch] : GObjectify * e-table-memory.[ch] : GObjectify * e-table-model.[ch] : GObjectify * e-table-one.[ch] : GObjectify * e-table-simple.[ch] : GObjectify * e-tree-memory.[ch] : GObjectify * e-tree-model.[ch] : GObjectify * e-tree-selection-model.c : use GObject api for models * e-tree-simple.[ch] : GObjectify * e-tree-sorted.[ch] : GObjectify * e-tree-table-adapter.[ch] : GObjectify * e-tree.c : use GObject api for models svn path=/trunk/; revision=18553 --- widgets/table/e-table-one.c | 43 ++++++++++--------------------------------- 1 file changed, 10 insertions(+), 33 deletions(-) (limited to 'widgets/table/e-table-one.c') diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c index 15193c46d3..e25b13c263 100644 --- a/widgets/table/e-table-one.c +++ b/widgets/table/e-table-one.c @@ -23,8 +23,7 @@ #include #include "e-table-one.h" - -#define PARENT_TYPE e_table_model_get_type () +#include "gal/util/e-util.h" static ETableModelClass *parent_class = NULL; @@ -158,19 +157,18 @@ one_dispose (GObject *object) ETableOne *one = E_TABLE_ONE (object); if (one->source) - gtk_object_unref(GTK_OBJECT(one->source)); + g_object_unref(G_OBJECT(one->source)); one->source = NULL; G_OBJECT_CLASS (parent_class)->dispose (object); } static void -e_table_one_class_init (GtkObjectClass *object_class) +e_table_one_class_init (GObjectClass *object_class) { ETableModelClass *model_class = (ETableModelClass *) object_class; - GObjectClass *gobject_class = (GObjectClass *) object_class; - parent_class = gtk_type_class (E_TABLE_MODEL_TYPE); + parent_class = g_type_class_peek_parent (object_class); model_class->column_count = one_column_count; model_class->row_count = one_row_count; @@ -183,12 +181,12 @@ e_table_one_class_init (GtkObjectClass *object_class) model_class->value_is_empty = one_value_is_empty; model_class->value_to_string = one_value_to_string; - gobject_class->dispose = one_dispose; - gobject_class->finalize = one_finalize; + object_class->dispose = one_dispose; + object_class->finalize = one_finalize; } static void -e_table_one_init (GtkObject *object) +e_table_one_init (GObject *object) { ETableOne *one = E_TABLE_ONE(object); @@ -196,28 +194,8 @@ e_table_one_init (GtkObject *object) one->data = NULL; } -GtkType -e_table_one_get_type (void) -{ - static GtkType type = 0; - - if (!type){ - GtkTypeInfo info = { - "ETableOne", - sizeof (ETableOne), - sizeof (ETableOneClass), - (GtkClassInitFunc) e_table_one_class_init, - (GtkObjectInitFunc) e_table_one_init, - NULL, /* reserved 1 */ - NULL, /* reserved 2 */ - (GtkClassInitFunc) NULL - }; - - type = gtk_type_unique (PARENT_TYPE, &info); - } +E_MAKE_TYPE(e_table_one, "ETableOne", ETableOne, e_table_one_class_init, e_table_one_init, E_TABLE_MODEL_TYPE) - return type; -} ETableModel * e_table_one_new (ETableModel *source) @@ -226,8 +204,7 @@ e_table_one_new (ETableModel *source) int col_count; int i; - eto = gtk_type_new (e_table_one_get_type ()); - + eto = g_object_new (E_TABLE_ONE_TYPE, NULL); eto->source = source; col_count = e_table_model_column_count(source); @@ -237,7 +214,7 @@ e_table_one_new (ETableModel *source) } if (source) - gtk_object_ref(GTK_OBJECT(source)); + g_object_ref(G_OBJECT(source)); return (ETableModel *) eto; } -- cgit v1.2.3