gtk+ r20446 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Wed Jun 18 08:26:53 2008
New Revision: 20446
URL: http://svn.gnome.org/viewvc/gtk+?rev=20446&view=rev

Log:
2008-06-18  Michael Natterer  <mitch imendio com>

	* gtk/gtktypeutils.h: deprecate GtkType, GtkSignalFunc and
	GTK_SIGNAL_FUNC().

	(struct GtkArg): s/GtkType/GType/ and s/GtkSignalFunc/GCallback/



Modified:
   trunk/ChangeLog
   trunk/gtk/gtktypeutils.h

Modified: trunk/gtk/gtktypeutils.h
==============================================================================
--- trunk/gtk/gtktypeutils.h	(original)
+++ trunk/gtk/gtktypeutils.h	Wed Jun 18 08:26:53 2008
@@ -88,15 +88,14 @@
 
 /* glib type wrappers (compatibility) */
 
-typedef GTypeInstance		GtkTypeObject;
-typedef GTypeClass		GtkTypeClass;
-typedef GBaseInitFunc		GtkClassInitFunc;
-typedef GInstanceInitFunc	GtkObjectInitFunc;
+typedef GType                   GtkType;
+typedef GTypeInstance           GtkTypeObject;
+typedef GTypeClass              GtkTypeClass;
+typedef GBaseInitFunc           GtkClassInitFunc;
+typedef GInstanceInitFunc       GtkObjectInitFunc;
 
 #endif /* GTK_DISABLE_DEPRECATED */
 
-typedef GType                   GtkType;
-
 G_END_DECLS
 
 /* Builtin Types
@@ -121,20 +120,27 @@
 				     gpointer      data,
 				     guint         n_args,
 				     GtkArg       *args);
+
+#ifndef GTK_DISABLE_DEPRECATED
+
 typedef void (*GtkSignalFunc)       (void);
 
+#endif /* GTK_DISABLE_DEPRECATED */
+
 /* This used to be defined in gtkitemfactory.h, but moved over here after
  * the complete deprecation of that header
  */
 typedef gchar * (*GtkTranslateFunc) (const gchar  *path,
 				     gpointer      func_data);
 
-#define GTK_SIGNAL_FUNC(f)	    ((GtkSignalFunc) (f))
-
 #ifndef GTK_DISABLE_DEPRECATED
-typedef struct _GtkTypeInfo 	     GtkTypeInfo;
+
+#define GTK_SIGNAL_FUNC(f)	    G_CALLBACK(f)
+
+typedef struct _GtkTypeInfo         GtkTypeInfo;
 typedef GSignalCMarshaller          GtkSignalMarshaller;
-#endif
+
+#endif /* GTK_DISABLE_DEPRECATED */
 
 #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 
@@ -143,7 +149,7 @@
 /* GtkArg, used to hold differently typed values */
 struct _GtkArg
 {
-  GtkType type;
+  GType type;
   gchar *name;
 
   /* this union only defines the required storage types for
@@ -169,7 +175,7 @@
 
     /* structured values */
     struct {
-      GtkSignalFunc f;
+      GCallback f;
       gpointer d;
     } signal_data;
   } d;