callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/string_data/pointer_data/ as needed to match GtkArg

Browse Source 
s/string_data/pointer_data/ as needed to match GtkArg
This commit is contained in:
Elliot Lee 1998-06-14 07:58:02 +00:00
parent e17f31db8f
commit 208057b914
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkbindings.c
View File

@ -62,7 +62,7 @@ binding_signal_free (GtkBindingSignal *sig)
for (i = 0; i < sig->n_args; i++) for (i = 0; i < sig->n_args; i++)
{ {
if (sig->args[i].arg_type == GTK_BINDING_ARG_STRING) 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->args);
g_free (sig->signal_name); g_free (sig->signal_name);
@ -268,7 +268,7 @@ binding_compose_params (GtkBindingArg *args,
{ {
case GTK_BINDING_ARG_STRING: case GTK_BINDING_ARG_STRING:
if (params->type == GTK_TYPE_STRING) if (params->type == GTK_TYPE_STRING)
GTK_VALUE_STRING (*params) = args->d.string_data; GTK_VALUE_STRING (*params) = args->d.pointer_data;
else else
valid = FALSE; valid = FALSE;
break; break;
@ -569,14 +569,14 @@ gtk_binding_entry_add_signall (GtkBindingSet *binding_set,
arg->d.double_data = tmp_arg->d.double_data; arg->d.double_data = tmp_arg->d.double_data;
break; break;
case GTK_BINDING_ARG_STRING: 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); 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); binding_signal_free (signal);
return; return;
} }
arg->d.string_data = g_strdup (tmp_arg->d.string_data); arg->d.pointer_data = g_strdup (tmp_arg->d.pointer_data);
break; break;
default: default:
g_warning ("gtk_binding_entry_add_signall(): unsupported type `%s' for arg[%u]", 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); arg->d.double_data = va_arg (args, gdouble);
break; break;
case GTK_BINDING_ARG_STRING: case GTK_BINDING_ARG_STRING:
arg->d.string_data = va_arg (args, gchar*); arg->d.pointer_data = va_arg (args, gchar*);
if (!arg->d.string_data) if (!arg->d.pointer_data)
{ {
g_warning ("gtk_binding_entry_add_signal(): value of `string' arg[%u] is `NULL'", i); g_warning ("gtk_binding_entry_add_signal(): value of `string' arg[%u] is `NULL'", i);
i = n_args + 2; i = n_args + 2;

2
gtk/gtktypeutils.c
View File

@ -523,7 +523,7 @@ gtk_arg_copy (GtkArg *src_arg,
dest_arg->d = src_arg->d; dest_arg->d = src_arg->d;
if (src_arg->type == GTK_TYPE_STRING) 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; return dest_arg;
} }

4
gtk/gtktypeutils.h
View File

@ -106,9 +106,7 @@ struct _GtkArg
gulong ulong_data; gulong ulong_data;
gfloat float_data; gfloat float_data;
gdouble double_data; gdouble double_data;
gchar *string_data;
gpointer pointer_data; gpointer pointer_data;
GtkObject *object_data;
struct { struct {
GtkCallbackMarshal marshal; GtkCallbackMarshal marshal;
gpointer data; gpointer data;
@ -141,7 +139,7 @@ struct _GtkArg
#define GTK_VALUE_ULONG(a) ((a).d.ulong_data) #define GTK_VALUE_ULONG(a) ((a).d.ulong_data)
#define GTK_VALUE_FLOAT(a) ((a).d.float_data) #define GTK_VALUE_FLOAT(a) ((a).d.float_data)
#define GTK_VALUE_DOUBLE(a) ((a).d.double_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_ENUM(a) ((a).d.int_data)
#define GTK_VALUE_FLAGS(a) ((a).d.int_data) #define GTK_VALUE_FLAGS(a) ((a).d.int_data)
#define GTK_VALUE_BOXED(a) ((a).d.pointer_data) #define GTK_VALUE_BOXED(a) ((a).d.pointer_data)