#include "dict-display.h"
#include "dialog-common.h"
#include "widget-io.h"
+#include "psppire-scanf.h"
+#include "builder-wrapper.h"
#include "helper.h"
+
#include <xalloc.h>
if ( ! scd->hbox1 )
{
- scd->hbox1 = widget_scanf (gettext (label1), &scd->spinbutton);
+ scd->hbox1 = psppire_scanf_new (gettext (label1), &scd->spinbutton);
gtk_widget_show (scd->hbox1);
if ( ! scd->hbox2 )
{
scd->hbox2 =
- widget_scanf (gettext (label2), &scd->spinbutton1, &scd->spinbutton2);
+ psppire_scanf_new (gettext (label2), &scd->spinbutton1, &scd->spinbutton2);
gtk_spin_button_set_range (GTK_SPIN_BUTTON (scd->spinbutton1),
1, case_count);
gchar *text = NULL;
GString *string = g_string_new ("");
- const gchar filter[]="filter_$";
+ const gchar *filter = "filter_$";
const gchar key[]="case_$";
if ( gtk_toggle_button_get_active
g_string_append (string, "EXECUTE.\n");
}
+ else
+ {
+ GtkEntry *entry =
+ GTK_ENTRY (get_widget_assert (scd->xml,
+ "filter-variable-entry"));
+ filter = gtk_entry_get_text (entry);
+ }
g_string_append_printf (string, "FILTER BY %s.\n", filter);