Commit 9d210427 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

deprecate GtkType, GtkSignalFunc and GTK_SIGNAL_FUNC().

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/


svn path=/trunk/; revision=20446
parent 1a23e150
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/
2008-06-18 Michael Natterer <mitch@imendio.com>
* gtk/gtktypeutils.[ch]: deprecate gtk_type_class().
......
......@@ -88,15 +88,14 @@ typedef GType GtkFundamentalType;
/* 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 @@ typedef void (*GtkCallbackMarshal) (GtkObject *object,
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 @@ typedef GSignalCMarshaller GtkSignalMarshaller;
/* 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 @@ struct _GtkArg
/* structured values */
struct {
GtkSignalFunc f;
GCallback f;
gpointer d;
} signal_data;
} d;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment