diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-06-16 16:26:49 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-06-16 16:26:49 +0000 |
| commit | 0329e41742452aec38150ed81520537b9ff71498 (patch) | |
| tree | 3fb3defed2bcf1334a40f6280149d418b8f752fd /gtk/gtkobject.h | |
| parent | afe9dcfca199a30d779d2ed42dc19ecbe13e0a9f (diff) | |
| download | gtk+-0329e41742452aec38150ed81520537b9ff71498.tar.gz | |
gtk/gtkcellrendereraccel.h gtk/gtkiconview.h use G_TYPE macros instead of
2008-06-16 Michael Natterer <mitch@imendio.com>
* gtk/gtkcellrendereraccel.h
* gtk/gtkiconview.h
* gtk/gtkobject.h: use G_TYPE macros instead of the old GTK_CHECK
macros for type checking.
(gtk_object_get_type): change prototype to return GType instead of
GtkType.
svn path=/trunk/; revision=20403
Diffstat (limited to 'gtk/gtkobject.h')
| -rw-r--r-- | gtk/gtkobject.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h index ba6252071b..f8ec563031 100644 --- a/gtk/gtkobject.h +++ b/gtk/gtkobject.h @@ -42,12 +42,12 @@ G_BEGIN_DECLS * and to test whether `object' and `klass' are of type GTK_TYPE_OBJECT. * these are the standard macros for all GtkObject-derived classes. */ -#define GTK_TYPE_OBJECT (gtk_object_get_type ()) -#define GTK_OBJECT(object) (GTK_CHECK_CAST ((object), GTK_TYPE_OBJECT, GtkObject)) -#define GTK_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_OBJECT, GtkObjectClass)) -#define GTK_IS_OBJECT(object) (GTK_CHECK_TYPE ((object), GTK_TYPE_OBJECT)) -#define GTK_IS_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OBJECT)) -#define GTK_OBJECT_GET_CLASS(object) (GTK_CHECK_GET_CLASS ((object), GTK_TYPE_OBJECT, GtkObjectClass)) +#define GTK_TYPE_OBJECT (gtk_object_get_type ()) +#define GTK_OBJECT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_OBJECT, GtkObject)) +#define GTK_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_OBJECT, GtkObjectClass)) +#define GTK_IS_OBJECT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_OBJECT)) +#define GTK_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OBJECT)) +#define GTK_OBJECT_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), GTK_TYPE_OBJECT, GtkObjectClass)) /* Macros for extracting various fields from GtkObject and GtkObjectClass. */ @@ -123,7 +123,7 @@ struct _GtkObjectClass /* Application-level methods */ -GtkType gtk_object_get_type (void) G_GNUC_CONST; +GType gtk_object_get_type (void) G_GNUC_CONST; #ifndef GTK_DISABLE_DEPRECATED void gtk_object_sink (GtkObject *object); |