New file: builder-wrapper.h and builder-wrapper.c

[pspp-builds.git] / src / ui / gui / t-test-one-sample.c

diff --git a/src/ui/gui/t-test-one-sample.c b/src/ui/gui/t-test-one-sample.c
index ea92a9212946f05a5fdf9a932751c80616a496de..02d3eff345d780631500ea0419b460b958406fb8 100644 (file)
--- a/src/ui/gui/t-test-one-sample.c
+++ b/src/ui/gui/t-test-one-sample.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -22,7 +22,7 @@
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "psppire-var-view.h"
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-data-window.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
@@ -31,7 +31,7 @@
 #include "executor.h"
 
 #include "t-test-options.h"
-#include <language/syntax-string-source.h>
+#include "helper.h"
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -142,7 +142,7 @@ t_test_one_sample_dialog (PsppireDataWindow *de)
   g_object_get (vs, "dictionary", &tt_d.dict, NULL);
   tt_d.vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
   tt_d.test_value_entry = get_widget_assert (xml, "test-value-entry");
-  tt_d.opt = tt_options_dialog_create (xml, GTK_WINDOW (de));
+  tt_d.opt = tt_options_dialog_create (GTK_WINDOW (de));
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
@@ -166,23 +166,10 @@ t_test_one_sample_dialog (PsppireDataWindow *de)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-       gchar *syntax = generate_syntax (&tt_d);
-
-       struct getl_interface *sss = create_syntax_string_source (syntax);
-       execute_syntax (sss);
-
-       g_free (syntax);
-      }
+      g_free (execute_syntax_string (de, generate_syntax (&tt_d)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
-      {
-       gchar *syntax = generate_syntax (&tt_d);
-
-        paste_syntax_to_window (syntax);
-
-       g_free (syntax);
-      }
+      g_free (paste_syntax_to_window (generate_syntax (&tt_d)));
       break;
     default:
       break;