From 8676c45d5c33c7cf311d1a5cfa378330e320290c Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 17 Jun 2008 14:17:29 +0000 Subject: [PATCH] deprecate GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST, GTK_CHECK_GET_CLASS, 2008-06-17 Michael Natterer * gtk/gtktypeutils.h: deprecate GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST, GTK_CHECK_GET_CLASS, GTK_CHECK_TYPE and GTK_CHECK_CLASS_TYPE. Move the GtkType typedef to an undeprecated section. svn path=/trunk/; revision=20428 --- ChangeLog | 6 ++++++ gtk/gtktypeutils.h | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c94df7d0b..d1bf575124 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-17 Michael Natterer + + * gtk/gtktypeutils.h: deprecate GTK_CHECK_CAST, GTK_CHECK_CLASS_CAST, + GTK_CHECK_GET_CLASS, GTK_CHECK_TYPE and GTK_CHECK_CLASS_TYPE. + Move the GtkType typedef to an undeprecated section. + 2008-06-17 Michael Natterer * gtk/gtkprogress.h: use G_TYPE macros for type checking instead diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h index 8802ed91ef..4333ceedef 100644 --- a/gtk/gtktypeutils.h +++ b/gtk/gtktypeutils.h @@ -79,8 +79,6 @@ typedef GType GtkFundamentalType; #define GTK_FUNDAMENTAL_TYPE G_TYPE_FUNDAMENTAL #define GTK_STRUCT_OFFSET G_STRUCT_OFFSET -#endif /* GTK_DISABLE_DEPRECATED */ - /* glib macro wrappers (compatibility) */ #define GTK_CHECK_CAST G_TYPE_CHECK_INSTANCE_CAST #define GTK_CHECK_CLASS_CAST G_TYPE_CHECK_CLASS_CAST @@ -90,10 +88,6 @@ typedef GType GtkFundamentalType; /* glib type wrappers (compatibility) */ -typedef GType GtkType; - -#ifndef GTK_DISABLE_DEPRECATED - typedef GTypeInstance GtkTypeObject; typedef GTypeClass GtkTypeClass; typedef GBaseInitFunc GtkClassInitFunc; @@ -141,6 +135,11 @@ typedef GSignalCMarshaller GtkSignalMarshaller; #endif #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) + +/* glib type wrappers (compatibility) */ + +typedef GType GtkType; + /* Used by gtk_container_foreach_unmarshal () */ /* GtkArg, used to hold differently typed values */