/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2005, 2006 Free Software Foundation
+ Copyright (C) 2005, 2006, 2009 Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
{
struct missing_val_dialog *dialog = data;
- const struct fmt_spec *write_spec = var_get_write_format (dialog->pv);
-
if ( gtk_toggle_button_get_active (dialog->button_discrete))
{
gint nvals = 0;
continue;
}
- if ( text_to_value (text, &v, *write_spec))
+ if ( text_to_value (text, dialog->dict, dialog->pv, &v))
{
nvals++;
mv_add_value (&dialog->mvl, &v);
else
badvals++;
g_free (text);
+ value_destroy (&v, var_get_width (dialog->pv));
}
if ( nvals == 0 || badvals > 0 )
{
const gchar *low_text = gtk_entry_get_text (GTK_ENTRY (dialog->low));
const gchar *high_text = gtk_entry_get_text (GTK_ENTRY (dialog->high));
- if ( text_to_value (low_text, &low_val, *write_spec)
+ if ( text_to_value (low_text, dialog->dict, dialog->pv, &low_val)
&&
- text_to_value (high_text, &high_val, *write_spec) )
+ text_to_value (high_text, dialog->dict, dialog->pv, &high_val))
{
if ( low_val.f > high_val.f )
{
err_dialog (_("Incorrect range specification"),
GTK_WINDOW (dialog->window));
+ value_destroy (&low_val, var_get_width (dialog->pv));
+ value_destroy (&high_val, var_get_width (dialog->pv));
return ;
}
}
{
err_dialog (_("Incorrect range specification"),
GTK_WINDOW (dialog->window));
+ value_destroy (&low_val, var_get_width (dialog->pv));
+ value_destroy (&high_val, var_get_width (dialog->pv));
return;
}
mv_clear (&dialog->mvl);
mv_add_range (&dialog->mvl, low_val.f, high_val.f);
+ value_destroy (&low_val, var_get_width (dialog->pv));
+ value_destroy (&high_val, var_get_width (dialog->pv));
+
if ( discrete_text && strlen (g_strstrip (discrete_text)) > 0 )
{
union value discrete_val;
- if ( !text_to_value (discrete_text, &discrete_val,
- *write_spec))
+ if ( !text_to_value (discrete_text,
+ dialog->dict,
+ dialog->pv,
+ &discrete_val))
{
err_dialog (_("Incorrect value for variable type"),
GTK_WINDOW (dialog->window) );
g_free (discrete_text);
+ value_destroy (&discrete_val, var_get_width (dialog->pv));
return;
}
mv_add_value (&dialog->mvl, &discrete_val);
+ value_destroy (&discrete_val, var_get_width (dialog->pv));
}
g_free (discrete_text);
}
}
-/* Creates the dialog structure from the xml */
+/* Creates the dialog structure */
struct missing_val_dialog *
-missing_val_dialog_create (GtkBuilder *xml)
+missing_val_dialog_create (GtkWindow *toplevel)
{
- struct missing_val_dialog *dialog = g_malloc (sizeof (*dialog));
+ GtkBuilder *xml = builder_new ("var-sheet-dialogs.ui");
- // connect_help (xml);
+ struct missing_val_dialog *dialog = g_malloc (sizeof (*dialog));
dialog->window = get_widget_assert (xml, "missing_values_dialog");
gtk_window_set_transient_for
- (GTK_WINDOW (dialog->window),
- GTK_WINDOW (get_widget_assert (xml, "data_editor")));
-
+ (GTK_WINDOW (dialog->window), toplevel);
g_signal_connect_swapped (get_widget_assert (xml, "missing_val_cancel"),
"clicked", G_CALLBACK (gtk_widget_hide), dialog->window);
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "range_missing"));
- g_signal_connect (G_OBJECT (dialog->button_discrete), "toggled",
+ g_signal_connect (dialog->button_discrete, "toggled",
G_CALLBACK (discrete), dialog);
- g_signal_connect (G_OBJECT (dialog->button_range), "toggled",
+ g_signal_connect (dialog->button_range, "toggled",
G_CALLBACK (range), dialog);
+ g_object_unref (xml);
+
return dialog;
}
gchar *high_text;
mv_get_range (&dialog->mvl, &low.f, &high.f);
- low_text = value_to_text (low, *write_spec);
- high_text = value_to_text (high, *write_spec);
+
+ low_text = value_to_text (low, dialog->dict, *write_spec);
+ high_text = value_to_text (high, dialog->dict, *write_spec);
gtk_entry_set_text (GTK_ENTRY (dialog->low), low_text);
gtk_entry_set_text (GTK_ENTRY (dialog->high), high_text);
if ( mv_has_value (&dialog->mvl))
{
gchar *text;
- union value value;
- mv_get_value (&dialog->mvl, &value, 0);
- text = value_to_text (value, *write_spec);
+ text = value_to_text (*mv_get_value (&dialog->mvl, 0), dialog->dict, *write_spec);
gtk_entry_set_text (GTK_ENTRY (dialog->discrete), text);
g_free (text);
}
if ( i < n)
{
gchar *text ;
- union value value;
- mv_get_value (&dialog->mvl, &value, i);
- text = value_to_text (value, *write_spec);
+ text = value_to_text (*mv_get_value (&dialog->mvl, i), dialog->dict,
+ *write_spec);
gtk_entry_set_text (GTK_ENTRY (dialog->mv[i]), text);
g_free (text);
}