diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-06-18 09:39:24 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-06-18 09:39:24 +0000 |
| commit | 67c6c28fe04237187645c55195012dbb831955e9 (patch) | |
| tree | cbd017552919f705df7381c503cba193ad679c50 /gdk | |
| parent | fe8a946e876ad50ad70535ab70380c03a4eab58b (diff) | |
| download | gtk+-67c6c28fe04237187645c55195012dbb831955e9.tar.gz | |
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
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdk.h | 2 | ||||
| -rw-r--r-- | gdk/gdkevents.c | 4 | ||||
| -rw-r--r-- | gdk/gdktypes.h | 4 | ||||
| -rw-r--r-- | gdk/x11/gdkevents-x11.c | 2 |
4 files changed, 8 insertions, 4 deletions
@@ -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, diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index bc0e62a42d..adc6a1b84c 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -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); diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h index 06a7aa0627..ac8e4431d7 100644 --- a/gdk/gdktypes.h +++ b/gdk/gdktypes.h @@ -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; diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index f43a02ea62..500b0b444e 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -72,7 +72,7 @@ struct _GdkIOClosure { GdkInputFunction function; GdkInputCondition condition; - GdkDestroyNotify notify; + GDestroyNotify notify; gpointer data; }; |