aboutsummaryrefslogtreecommitdiffstats
path: root/e-util/e-iterator.h
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2002-11-03 13:46:46 +0800
committerChris Toshok <toshok@src.gnome.org>2002-11-03 13:46:46 +0800
commit805e75e7d9315f8cb9f6a7213fc373a8a873a242 (patch)
treedd0063aea1ff40a14325ec4021cd3f69abe7fc20 /e-util/e-iterator.h
parent9c73777f2268b5bf2622f893e2a3ba7d0f720572 (diff)
downloadgsoc2013-evolution-805e75e7d9315f8cb9f6a7213fc373a8a873a242.tar.gz
gsoc2013-evolution-805e75e7d9315f8cb9f6a7213fc373a8a873a242.tar.zst
gsoc2013-evolution-805e75e7d9315f8cb9f6a7213fc373a8a873a242.zip
add marshal building stuff, add e-util-marshal.c to SOURCES, and add
2002-11-02 Chris Toshok <toshok@ximian.com> * 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
Diffstat (limited to 'e-util/e-iterator.h')
-rw-r--r--e-util/e-iterator.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/e-util/e-iterator.h b/e-util/e-iterator.h
index a6f0899235..9dae97cc3a 100644
--- a/e-util/e-iterator.h
+++ b/e-util/e-iterator.h
@@ -12,23 +12,25 @@
#include <stdio.h>
#include <time.h>
-#include <gtk/gtkobject.h>
+#include <glib.h>
+#include <glib-object.h>
#define E_TYPE_ITERATOR (e_iterator_get_type ())
-#define E_ITERATOR(obj) (GTK_CHECK_CAST ((obj), E_TYPE_ITERATOR, EIterator))
-#define E_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ITERATOR, EIteratorClass))
-#define E_IS_ITERATOR(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_ITERATOR))
-#define E_IS_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ITERATOR))
+#define E_ITERATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ITERATOR, EIterator))
+#define E_ITERATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ITERATOR, EIteratorClass))
+#define E_IS_ITERATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ITERATOR))
+#define E_IS_ITERATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_ITERATOR))
+#define E_ITERATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_ITERATOR, EIteratorClass))
typedef struct _EIterator EIterator;
typedef struct _EIteratorClass EIteratorClass;
struct _EIterator {
- GtkObject object;
+ GObject object;
};
struct _EIteratorClass {
- GtkObjectClass parent_class;
+ GObjectClass parent_class;
/* Signals */
void (*invalidate) (EIterator *iterator);
@@ -63,7 +65,7 @@ gboolean e_iterator_is_valid (EIterator *iterator);
void e_iterator_invalidate (EIterator *iterator);
-/* Standard Gtk function */
-GtkType e_iterator_get_type (void);
+/* Standard Glib function */
+GType e_iterator_get_type (void);
#endif /* ! __E_ITERATOR_H__ */