diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gtk/gtkcellrendereraccel.h | 12 | ||||
| -rw-r--r-- | gtk/gtkiconview.h | 12 | ||||
| -rw-r--r-- | gtk/gtkobject.h | 14 |
4 files changed, 29 insertions, 19 deletions
@@ -1,3 +1,13 @@ +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. + 2008-06-16 Matthias Clasen <mclasen@redhat.com> * gtk/Makefile.am: Make folder, user-home and user-desktop links diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h index 40fa1eee1a..6dc8552859 100644 --- a/gtk/gtkcellrendereraccel.h +++ b/gtk/gtkcellrendereraccel.h @@ -28,12 +28,12 @@ G_BEGIN_DECLS -#define GTK_TYPE_CELL_RENDERER_ACCEL (gtk_cell_renderer_accel_get_type ()) -#define GTK_CELL_RENDERER_ACCEL(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccel)) -#define GTK_CELL_RENDERER_ACCEL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass)) -#define GTK_IS_CELL_RENDERER_ACCEL(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_ACCEL)) -#define GTK_IS_CELL_RENDERER_ACCEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_ACCEL)) -#define GTK_CELL_RENDERER_ACCEL_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass)) +#define GTK_TYPE_CELL_RENDERER_ACCEL (gtk_cell_renderer_accel_get_type ()) +#define GTK_CELL_RENDERER_ACCEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccel)) +#define GTK_CELL_RENDERER_ACCEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass)) +#define GTK_IS_CELL_RENDERER_ACCEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_ACCEL)) +#define GTK_IS_CELL_RENDERER_ACCEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_ACCEL)) +#define GTK_CELL_RENDERER_ACCEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass)) typedef struct _GtkCellRendererAccel GtkCellRendererAccel; typedef struct _GtkCellRendererAccelClass GtkCellRendererAccelClass; diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h index 68d8628f86..234bacc3fb 100644 --- a/gtk/gtkiconview.h +++ b/gtk/gtkiconview.h @@ -32,12 +32,12 @@ G_BEGIN_DECLS -#define GTK_TYPE_ICON_VIEW (gtk_icon_view_get_type ()) -#define GTK_ICON_VIEW(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_ICON_VIEW, GtkIconView)) -#define GTK_ICON_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_VIEW, GtkIconViewClass)) -#define GTK_IS_ICON_VIEW(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_ICON_VIEW)) -#define GTK_IS_ICON_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ICON_VIEW)) -#define GTK_ICON_VIEW_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ICON_VIEW, GtkIconViewClass)) +#define GTK_TYPE_ICON_VIEW (gtk_icon_view_get_type ()) +#define GTK_ICON_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ICON_VIEW, GtkIconView)) +#define GTK_ICON_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_VIEW, GtkIconViewClass)) +#define GTK_IS_ICON_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ICON_VIEW)) +#define GTK_IS_ICON_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ICON_VIEW)) +#define GTK_ICON_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ICON_VIEW, GtkIconViewClass)) typedef struct _GtkIconView GtkIconView; typedef struct _GtkIconViewClass GtkIconViewClass; 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); |