X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fselect-cases-dialog.c;h=5834bcc71f5b733c12f0acb51c26309bb73e59fb;hb=e730921f3cedd6a2f6bbca79b7cfdd37ec45c9fc;hp=ca1b31bc0b2a4305acf5e30243b95db27162c49b;hpb=84fbb877ec23bfab78876cd90aa7a29175495144;p=pspp-builds.git

diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c
index ca1b31bc..5834bcc7 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 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2009 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
@@ -18,7 +18,7 @@
 
 #include "select-cases-dialog.h"
 #include <gtk/gtk.h>
-#include "helper.h"
+#include "executor.h"
 #include "psppire-dialog.h"
 #include "psppire-data-window.h"
 #include "psppire-selector.h"
@@ -27,6 +27,7 @@
 #include "widget-io.h"
 #include <language/syntax-string-source.h>
 #include "helper.h"
+#include <xalloc.h>
 
 
 #include <gettext.h>
@@ -236,18 +237,17 @@ set_radiobutton (GtkWidget *button, gpointer data)
 
 /* Pops up the Select Cases dialog box */
 void
-select_cases_dialog (GObject *o, gpointer data)
+select_cases_dialog (PsppireDataWindow *de)
 {
   gint response;
   struct select_cases_dialog scd = {0,0,0,0,0,0};
   GtkWidget *dialog   ;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   GtkWidget *entry = NULL;
   GtkWidget *selector ;
   GtkWidget *button_range;
   GtkWidget *button_sample;
 
-  scd.xml = builder_new ("psppire.ui");
+  scd.xml = builder_new ("select-cases.ui");
 
   g_object_get (de->data_editor, "data-store", &scd.data_store, NULL);
 
@@ -330,12 +330,8 @@ select_cases_dialog (GObject *o, gpointer data)
 		  "selection-mode",
 		  GTK_SELECTION_SINGLE, NULL);
 
-    psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
-				   source,
-				   entry,
-				   insert_source_row_into_entry,
-				   is_currently_in_entry,
-				   NULL);
+    psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector),
+				   is_currently_in_entry);
   }
 
 
@@ -365,7 +361,7 @@ select_cases_dialog (GObject *o, gpointer data)
     case PSPPIRE_RESPONSE_PASTE:
       {
 	gchar *syntax = generate_syntax (&scd);
-        paste_syntax_in_new_window (syntax);
+        paste_syntax_to_window (syntax);
 
 	g_free (syntax);
       }
@@ -388,7 +384,7 @@ generate_syntax (const struct select_cases_dialog *scd)
        (GTK_TOGGLE_BUTTON (get_widget_assert (scd->xml,
 					      "radiobutton-all"))))
     {
-      return strdup ("\n");
+      return xstrdup ("\n");
     }
 
   string = g_string_new ("");