From 805e75e7d9315f8cb9f6a7213fc373a8a873a242 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Sun, 3 Nov 2002 05:46:46 +0000 Subject: add marshal building stuff, add e-util-marshal.c to SOURCES, and add 2002-11-02 Chris Toshok * Makefile.am: add marshal building stuff, add e-util-marshal.c to SOURCES, and add e-util-marshal.list to EXTRA_DIST. * e-util-marshal.list: add marshallers for e-util. * e-list.c: convert to GObject. * e-list.h: convert to GObject. * e-iterator.c: convert to GObject. * e-iterator.h: convert to GObject. * e-list-iterator.c: convert to GObject. * e-list-iterator.h: convert to GObject. * .cvsignore: ignore e-util-marshal.[ch] svn path=/trunk/; revision=18504 --- e-util/e-list.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'e-util/e-list.h') diff --git a/e-util/e-list.h b/e-util/e-list.h index da63576996..4c9357aebd 100644 --- a/e-util/e-list.h +++ b/e-util/e-list.h @@ -15,20 +15,22 @@ typedef struct _EListClass EListClass; #include #include -#include +#include +#include #include #define E_TYPE_LIST (e_list_get_type ()) -#define E_LIST(obj) (GTK_CHECK_CAST ((obj), E_TYPE_LIST, EList)) -#define E_LIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LIST, EListClass)) -#define E_IS_LIST(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_LIST)) -#define E_IS_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_LIST)) +#define E_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_LIST, EList)) +#define E_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_LIST, EListClass)) +#define E_IS_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_LIST)) +#define E_IS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_LIST)) +#define E_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_LIST, EListClass)) typedef void *(*EListCopyFunc) (const void *data, void *closure); typedef void (*EListFreeFunc) (void *data, void *closure); struct _EList { - GtkObject object; + GObject object; GList *list; GList *iterators; EListCopyFunc copy; @@ -37,7 +39,7 @@ struct _EList { }; struct _EListClass { - GtkObjectClass parent_class; + GObjectClass parent_class; }; EList *e_list_new (EListCopyFunc copy, @@ -57,7 +59,7 @@ void e_list_remove_iterator (EList *list, void e_list_invalidate_iterators (EList *list, EIterator *skip); -/* Standard Gtk function */ -GtkType e_list_get_type (void); +/* Standard Glib function */ +GType e_list_get_type (void); #endif /* ! __E_LIST_H__ */ -- cgit