diff options
| author | Olivier Abad <oabad@noos.fr> | 2003-12-16 18:43:35 +0000 |
|---|---|---|
| committer | Olivier Abad <oabad@noos.fr> | 2003-12-16 18:43:35 +0000 |
| commit | abb4aec1fe46e0a8e9ef34b1bc150c693d7c1e43 (patch) | |
| tree | dd4d79b69fcb1a2a5ae65ba12bcfefd3ba4946de /gtk/compat_macros.h | |
| parent | e411cd98b8b09f2ee953bd6a692bf09e313064ad (diff) | |
Use gtk compatibility macros (from compat_macros.h) instead of some gtk+
v1.2 functions which are deprecated in gtk+ v2.
Update OBJECT_SET_DATA macros to cast "data" to (gpointer).
svn path=/trunk/; revision=9296
Diffstat (limited to 'gtk/compat_macros.h')
| -rw-r--r-- | gtk/compat_macros.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h index cb4ace381f..7bebad8573 100644 --- a/gtk/compat_macros.h +++ b/gtk/compat_macros.h @@ -1,7 +1,7 @@ /* compat_macros.h * GTK-related Global defines, etc. * - * $Id: compat_macros.h,v 1.3 2002/11/15 23:50:06 oabad Exp $ + * $Id: compat_macros.h,v 1.4 2003/12/16 18:43:33 oabad Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -46,7 +46,7 @@ gtk_signal_connect_object(GTK_OBJECT(widget), name, GTK_SIGNAL_FUNC(callback), \ gtk_signal_disconnect_by_func(GTK_OBJECT(object), func, data) #define OBJECT_SET_DATA(widget, key, data) \ -gtk_object_set_data(GTK_OBJECT(widget), key, data) +gtk_object_set_data(GTK_OBJECT(widget), key, (gpointer)data) #define OBJECT_SET_DATA_FULL(widget, key, data, destroy) \ gtk_object_set_data_full(GTK_OBJECT(widget), key, (gpointer)(data), \ @@ -87,7 +87,7 @@ g_signal_connect_swapped(G_OBJECT(widget), name, G_CALLBACK(callback), \ g_signal_handlers_disconnect_by_func(G_OBJECT(object), func, data) #define OBJECT_SET_DATA(widget, key, data) \ -g_object_set_data(G_OBJECT(widget), key, data) +g_object_set_data(G_OBJECT(widget), key, (gpointer)data) #define OBJECT_SET_DATA_FULL(widget, key, data, destroy) \ g_object_set_data_full(G_OBJECT(widget), key, (gpointer)(data), \ |