From cd31ceb85fc5d5f14bb7f1867851e2853fd0ab77 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 13 Nov 2002 20:20:01 +0000 Subject: start porting to GObject. 2002-11-13 Chris Toshok * gal-view-collection.[ch]: start porting to GObject. * gal-view-etable.[ch]: same. * gal-view-factory-etable.[ch]: same. * gal-view-factory.[ch]: same. * gal-view-factory.[ch]: same. * gal-view-instance.[ch]: same. * gal-view.[ch]: same. svn path=/trunk/; revision=18745 --- widgets/menus/gal-view-collection.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'widgets/menus/gal-view-collection.h') diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h index 8ce6d1be82..9ba5eab71f 100644 --- a/widgets/menus/gal-view-collection.h +++ b/widgets/menus/gal-view-collection.h @@ -30,15 +30,16 @@ G_BEGIN_DECLS #define GAL_VIEW_COLLECTION_TYPE (gal_view_collection_get_type ()) -#define GAL_VIEW_COLLECTION(o) (GTK_CHECK_CAST ((o), GAL_VIEW_COLLECTION_TYPE, GalViewCollection)) -#define GAL_VIEW_COLLECTION_CLASS(k) (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_COLLECTION_TYPE, GalViewCollectionClass)) -#define GAL_IS_VIEW_COLLECTION(o) (GTK_CHECK_TYPE ((o), GAL_VIEW_COLLECTION_TYPE)) -#define GAL_IS_VIEW_COLLECTION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_COLLECTION_TYPE)) +#define GAL_VIEW_COLLECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_COLLECTION_TYPE, GalViewCollection)) +#define GAL_VIEW_COLLECTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GAL_VIEW_COLLECTION_TYPE, GalViewCollectionClass)) +#define GAL_IS_VIEW_COLLECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAL_VIEW_COLLECTION_TYPE)) +#define GAL_IS_VIEW_COLLECTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAL_VIEW_COLLECTION_TYPE)) +#define GAL_VIEW_COLLECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GAL_VIEW_COLLECTION_TYPE, GalViewCollectionClass)) typedef struct GalViewCollectionItem GalViewCollectionItem; typedef struct { - GtkObject base; + GObject base; GalViewCollectionItem **view_data; int view_count; @@ -60,7 +61,7 @@ typedef struct { } GalViewCollection; typedef struct { - GtkObjectClass parent_class; + GObjectClass parent_class; /* * Signals @@ -84,7 +85,7 @@ struct GalViewCollectionItem { }; /* Standard functions */ -GtkType gal_view_collection_get_type (void); +GType gal_view_collection_get_type (void); GalViewCollection *gal_view_collection_new (void); void gal_view_collection_set_title (GalViewCollection *collection, -- cgit v1.2.3