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-bit-array.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'e-util/e-bit-array.h') diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h index c06f405ede..ebfe644da6 100644 --- a/e-util/e-bit-array.h +++ b/e-util/e-bit-array.h @@ -24,17 +24,17 @@ #ifndef _E_BIT_ARRAY_H_ #define _E_BIT_ARRAY_H_ -#include +#include #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ #define E_BIT_ARRAY_TYPE (e_bit_array_get_type ()) -#define E_BIT_ARRAY(o) (GTK_CHECK_CAST ((o), E_BIT_ARRAY_TYPE, EBitArray)) -#define E_BIT_ARRAY_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_BIT_ARRAY_TYPE, EBitArrayClass)) -#define E_IS_BIT_ARRAY(o) (GTK_CHECK_TYPE ((o), E_BIT_ARRAY_TYPE)) -#define E_IS_BIT_ARRAY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BIT_ARRAY_TYPE)) +#define E_BIT_ARRAY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_BIT_ARRAY_TYPE, EBitArray)) +#define E_BIT_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_BIT_ARRAY_TYPE, EBitArrayClass)) +#define E_IS_BIT_ARRAY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_BIT_ARRAY_TYPE)) +#define E_IS_BIT_ARRAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_BIT_ARRAY_TYPE)) #ifndef _E_FOREACH_FUNC_H_ #define _E_FOREACH_FUNC_H_ @@ -43,18 +43,18 @@ typedef void (*EForeachFunc) (int model_row, #endif typedef struct { - GtkObject base; + GObject base; gint bit_count; guint32 *data; } EBitArray; typedef struct { - GtkObjectClass parent_class; + GObjectClass parent_class; } EBitArrayClass; -GtkType e_bit_array_get_type (void); +GType e_bit_array_get_type (void); EBitArray *e_bit_array_new (int count); gboolean e_bit_array_value_at (EBitArray *selection, -- cgit v1.2.3