X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fregression-dialog.c;h=7bea89e185a27f0f5307f9540c16204c6e69778f;hb=3ca11d9dd35fd7a6f343e008724a7b245dc2e6e5;hp=070d30a6e74bbfe59749eba9c86903e79f502827;hpb=fd0c595927a23ea0373551a1eed4570388ea0fc5;p=pspp

diff --git a/src/ui/gui/regression-dialog.c b/src/ui/gui/regression-dialog.c
index 070d30a6e7..7bea89e185 100644
--- a/src/ui/gui/regression-dialog.c
+++ b/src/ui/gui/regression-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008  Free Software Foundation
+   Copyright (C) 2008, 2010, 2011  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
@@ -23,7 +23,6 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
-#include <language/syntax-string-source.h>
 #include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
@@ -222,13 +221,12 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Regression dialog box */
 void
-regression_dialog (GObject *o, gpointer data)
+regression_dialog (PsppireDataWindow *de)
 {
   gint response;
   struct regression_dialog rd;
 
   GtkBuilder *xml = builder_new ("regression.ui");
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "regression-dialog");
@@ -238,6 +236,7 @@ regression_dialog (GObject *o, gpointer data)
   GtkWidget *stat_button = get_widget_assert (xml, "stat-button");
   GtkWidget *save_button = get_widget_assert (xml, "save-button");
 
+  GtkWidget *dep_selector = get_widget_assert (xml, "dep-selector");
 
   rd.stat_view = get_widget_assert (xml, "stat-view");
 
@@ -258,6 +257,7 @@ regression_dialog (GObject *o, gpointer data)
   rd.dep_vars = GTK_TREE_VIEW (dest_dep);
   rd.indep_vars = GTK_TREE_VIEW (dest_indep);
 
+  psppire_selector_set_allow (PSPPIRE_SELECTOR (dep_selector), numeric_only);
 
   rd.save_dialog = get_widget_assert (xml, "save-dialog");
   rd.pred_button = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "pred-button"));
@@ -287,22 +287,10 @@ regression_dialog (GObject *o, gpointer data)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-	gchar *syntax = generate_syntax (&rd);
-
-	struct getl_interface *sss = create_syntax_string_source (syntax);
-	execute_syntax (sss);
-
-	g_free (syntax);
-      }
+      g_free (execute_syntax_string (de, generate_syntax (&rd)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
-      {
-	gchar *syntax = generate_syntax (&rd);
-        paste_syntax_in_new_window (syntax);
-
-	g_free (syntax);
-      }
+      g_free (paste_syntax_to_window (generate_syntax (&rd)));
       break;
     default:
       break;