diff options
| author | Elliot Lee <sopwith@src.gnome.org> | 1998-06-14 07:58:02 +0000 |
|---|---|---|
| committer | Elliot Lee <sopwith@src.gnome.org> | 1998-06-14 07:58:02 +0000 |
| commit | 208057b914c63348d06dd16c586dbd4c3d2014cc (patch) | |
| tree | bf65a0fcbda68398c6663262d2f1c767ec62a930 /gtk | |
| parent | e17f31db8f295f229a992fcd45912d3ef2b08b57 (diff) | |
| download | gtk+-208057b914c63348d06dd16c586dbd4c3d2014cc.tar.gz | |
s/string_data/pointer_data/ as needed to match GtkArg
s/string_data/pointer_data/ as needed to match GtkArg
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkbindings.c | 14 | ||||
| -rw-r--r-- | gtk/gtktypeutils.c | 2 | ||||
| -rw-r--r-- | gtk/gtktypeutils.h | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index ad75a0228b..02e375fcf9 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -62,7 +62,7 @@ binding_signal_free (GtkBindingSignal *sig) for (i = 0; i < sig->n_args; i++) { if (sig->args[i].arg_type == GTK_BINDING_ARG_STRING) - g_free (sig->args[i].d.string_data); + g_free (sig->args[i].d.pointer_data); } g_free (sig->args); g_free (sig->signal_name); @@ -268,7 +268,7 @@ binding_compose_params (GtkBindingArg *args, { case GTK_BINDING_ARG_STRING: if (params->type == GTK_TYPE_STRING) - GTK_VALUE_STRING (*params) = args->d.string_data; + GTK_VALUE_STRING (*params) = args->d.pointer_data; else valid = FALSE; break; @@ -569,14 +569,14 @@ gtk_binding_entry_add_signall (GtkBindingSet *binding_set, arg->d.double_data = tmp_arg->d.double_data; break; case GTK_BINDING_ARG_STRING: - if (!tmp_arg->d.string_data) + if (!tmp_arg->d.pointer_data) { g_warning ("gtk_binding_entry_add_signall(): value of `string' arg[%u] is `NULL'", n); - arg->d.string_data = NULL; + arg->d.pointer_data = NULL; binding_signal_free (signal); return; } - arg->d.string_data = g_strdup (tmp_arg->d.string_data); + arg->d.pointer_data = g_strdup (tmp_arg->d.pointer_data); break; default: g_warning ("gtk_binding_entry_add_signall(): unsupported type `%s' for arg[%u]", @@ -643,8 +643,8 @@ gtk_binding_entry_add_signal (GtkBindingSet *binding_set, arg->d.double_data = va_arg (args, gdouble); break; case GTK_BINDING_ARG_STRING: - arg->d.string_data = va_arg (args, gchar*); - if (!arg->d.string_data) + arg->d.pointer_data = va_arg (args, gchar*); + if (!arg->d.pointer_data) { g_warning ("gtk_binding_entry_add_signal(): value of `string' arg[%u] is `NULL'", i); i = n_args + 2; diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c index 02dd046913..53bd7b3bcb 100644 --- a/gtk/gtktypeutils.c +++ b/gtk/gtktypeutils.c @@ -523,7 +523,7 @@ gtk_arg_copy (GtkArg *src_arg, dest_arg->d = src_arg->d; if (src_arg->type == GTK_TYPE_STRING) - dest_arg->d.string_data = g_strdup (src_arg->d.string_data); + dest_arg->d.pointer_data = g_strdup (src_arg->d.pointer_data); return dest_arg; } diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h index 3f390c3f43..bf1993e93c 100644 --- a/gtk/gtktypeutils.h +++ b/gtk/gtktypeutils.h @@ -106,9 +106,7 @@ struct _GtkArg gulong ulong_data; gfloat float_data; gdouble double_data; - gchar *string_data; gpointer pointer_data; - GtkObject *object_data; struct { GtkCallbackMarshal marshal; gpointer data; @@ -141,7 +139,7 @@ struct _GtkArg #define GTK_VALUE_ULONG(a) ((a).d.ulong_data) #define GTK_VALUE_FLOAT(a) ((a).d.float_data) #define GTK_VALUE_DOUBLE(a) ((a).d.double_data) -#define GTK_VALUE_STRING(a) ((a).d.string_data) +#define GTK_VALUE_STRING(a) ((a).d.pointer_data) #define GTK_VALUE_ENUM(a) ((a).d.int_data) #define GTK_VALUE_FLAGS(a) ((a).d.int_data) #define GTK_VALUE_BOXED(a) ((a).d.pointer_data) |