X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fselect-cases-dialog.c;h=381fc3dd8a104649404358b1abb5a7f4a7f08735;hb=2d50227e83065571866610b4534936d7bd532d31;hp=04fcf0dd52142bc8d628b5c17e4cb5ed9ee7770c;hpb=0c5217288cb57d0994d4c99997f5341e2c3a6871;p=pspp diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c index 04fcf0dd52..381fc3dd8a 100644 --- a/src/ui/gui/select-cases-dialog.c +++ b/src/ui/gui/select-cases-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. 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 @@ -347,7 +347,7 @@ select_cases_dialog (PsppireDataWindow *de) switch (response) { case GTK_RESPONSE_OK: - g_free (execute_syntax_string (generate_syntax (&scd))); + g_free (execute_syntax_string (de, generate_syntax (&scd))); break; case PSPPIRE_RESPONSE_PASTE: g_free (paste_syntax_to_window (generate_syntax (&scd))); @@ -366,7 +366,7 @@ generate_syntax_filter (const struct select_cases_dialog *scd) 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 @@ -462,6 +462,13 @@ generate_syntax_filter (const struct select_cases_dialog *scd) 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);