gtk+ r20428 - in trunk: . gtk
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gtk+ r20428 - in trunk: . gtk
- Date: Tue, 17 Jun 2008 14:17:29 +0000 (UTC)
Author: mitch
Date: Tue Jun 17 14:17:29 2008
New Revision: 20428
URL: http://svn.gnome.org/viewvc/gtk+?rev=20428&view=rev
Log:
2008-06-17 Michael Natterer <mitch imendio com>
* 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.
Modified:
trunk/ChangeLog
trunk/gtk/gtktypeutils.h
Modified: trunk/gtk/gtktypeutils.h
==============================================================================
--- trunk/gtk/gtktypeutils.h (original)
+++ trunk/gtk/gtktypeutils.h Tue Jun 17 14:17:29 2008
@@ -79,8 +79,6 @@
#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 @@
/* glib type wrappers (compatibility) */
-typedef GType GtkType;
-
-#ifndef GTK_DISABLE_DEPRECATED
-
typedef GTypeInstance GtkTypeObject;
typedef GTypeClass GtkTypeClass;
typedef GBaseInitFunc GtkClassInitFunc;
@@ -141,6 +135,11 @@
#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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]