diff options
Diffstat (limited to 'e-util/e-iterator.h')
| -rw-r--r-- | e-util/e-iterator.h | 20 |
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__ */ |