deprecate GdkDestroyNotify.

2008-06-18  Michael Natterer  <mitch@imendio.com>

	* gdk/gdk.h: deprecate GdkDestroyNotify.

	* gdk/gdkevents.c
	* gdk/gdktypes.h
	* gdk/x11/gdkevents-x11.c
	* gtk/gtkmain.c: s/GdkDestroyNotify/GDestroyNotify/g.


svn path=/trunk/; revision=20449
This commit is contained in:
Michael Natterer 2008-06-18 09:39:24 +00:00 committed by Michael Natterer
parent fe8a946e87
commit 67c6c28fe0
6 changed files with 18 additions and 5 deletions

View File

@ -1,3 +1,12 @@
2008-06-18 Michael Natterer <mitch@imendio.com>
* gdk/gdk.h: deprecate GdkDestroyNotify.
* gdk/gdkevents.c
* gdk/gdktypes.h
* gdk/x11/gdkevents-x11.c
* gtk/gtkmain.c: s/GdkDestroyNotify/GDestroyNotify/g.
2008-06-18 Michael Natterer <mitch@imendio.com>
* gtk/gtktypeutils.h: deprecate GtkDestroyNotify.

View File

@ -102,7 +102,7 @@ gint gdk_input_add_full (gint source,
GdkInputCondition condition,
GdkInputFunction function,
gpointer data,
GdkDestroyNotify destroy);
GDestroyNotify destroy);
#endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
#ifndef GDK_DISABLE_DEPRECATED
gint gdk_input_add (gint source,

View File

@ -37,7 +37,7 @@ struct _GdkIOClosure
{
GdkInputFunction function;
GdkInputCondition condition;
GdkDestroyNotify notify;
GDestroyNotify notify;
gpointer data;
};
@ -1020,7 +1020,7 @@ gdk_input_add_full (gint source,
GdkInputCondition condition,
GdkInputFunction function,
gpointer data,
GdkDestroyNotify destroy)
GDestroyNotify destroy)
{
guint result;
GdkIOClosure *closure = g_new (GdkIOClosure, 1);

View File

@ -179,8 +179,12 @@ typedef void (*GdkInputFunction) (gpointer data,
gint source,
GdkInputCondition condition);
#ifndef GDK_DISABLE_DEPRECATED
typedef void (*GdkDestroyNotify) (gpointer data);
#endif /* GDK_DISABLE_DEPRECATED */
struct _GdkPoint
{
gint x;

View File

@ -72,7 +72,7 @@ struct _GdkIOClosure
{
GdkInputFunction function;
GdkInputCondition condition;
GdkDestroyNotify notify;
GDestroyNotify notify;
gpointer data;
};

View File

@ -2093,7 +2093,7 @@ gtk_input_add_full (gint source,
condition,
(GdkInputFunction) gtk_invoke_input,
closure,
(GdkDestroyNotify) gtk_destroy_closure);
(GDestroyNotify) gtk_destroy_closure);
}
else
return gdk_input_add_full (source, condition, function, data, destroy);