From b39be5377514b9bc3c43b7f5172645edd683e683 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 15 Nov 2002 02:47:18 +0000 Subject: deal with EBitArray/ESorter being a GObject now. 2002-11-14 Chris Toshok * gal/widgets/e-selection-model-array.c: deal with EBitArray/ESorter being a GObject now. * gal/widgets/e-selection-model-simple.c: same. * gal/util/e-bit-array.[ch]: this derives from GObject now. * gal/util/e-sorter.[ch]: same. * gal/util/e-sorter-array.[ch]: same. svn path=/trunk/; revision=18774 --- e-util/e-sorter-array.c | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) (limited to 'e-util/e-sorter-array.c') diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index ffc4d355df..ab1e748d9a 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -24,18 +24,12 @@ #include #include #include -#include #include "gal/util/e-util.h" #include "e-sorter-array.h" #define d(x) -/* The arguments we take */ -enum { - ARG_0 -}; - -#define PARENT_TYPE e_sorter_get_type() +#define PARENT_TYPE E_SORTER_TYPE #define INCREMENT_AMOUNT 100 @@ -233,44 +227,17 @@ e_sorter_array_construct (ESorterArray *esa, ESorterArray * e_sorter_array_new (ECompareRowsFunc compare, gpointer closure) { - ESorterArray *esa = gtk_type_new (E_SORTER_ARRAY_TYPE); + ESorterArray *esa = g_object_new (E_SORTER_ARRAY_TYPE, NULL); return e_sorter_array_construct (esa, compare, closure); } -static void -esa_destroy (GtkObject *object) -{ - GTK_OBJECT_CLASS (parent_class)->destroy (object); -} - -static void -esa_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) -{ - switch (arg_id) { - default: - break; - } -} - -static void -esa_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) -{ - switch (arg_id) { - } -} - static void esa_class_init (ESorterArrayClass *klass) { - GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass); ESorterClass *sorter_class = E_SORTER_CLASS(klass); - parent_class = gtk_type_class (PARENT_TYPE); - - object_class->destroy = esa_destroy; - object_class->set_arg = esa_set_arg; - object_class->get_arg = esa_get_arg; + parent_class = g_type_class_ref (PARENT_TYPE); sorter_class->model_to_sorted = esa_model_to_sorted ; sorter_class->sorted_to_model = esa_sorted_to_model ; -- cgit v1.2.3