Replace checkbox-treeview functions with a object PsppireCheckboxTreeview

[pspp] / src / ui / gui / k-related-dialog.c

diff --git a/src/ui/gui/k-related-dialog.c b/src/ui/gui/k-related-dialog.c
index fb0a785d8c492a1a80b78a7e3423cb724bbd0cd9..867583ade1590ca90e2bd07b8e9557219d7e21e7 100644 (file)
--- a/src/ui/gui/k-related-dialog.c
+++ b/src/ui/gui/k-related-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2010  Free Software Foundation
+   Copyright (C) 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
@@ -18,16 +18,14 @@
 
 #include "k-related-dialog.h"
 
-#include <language/syntax-string-source.h>
-
 #include "psppire-dialog.h"
 #include "psppire-var-view.h"
 #include "psppire-acr.h"
 #include "dialog-common.h"
 
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "executor.h"
-
+#include "helper.h"
 
 #include <gtk/gtk.h>
 
@@ -98,7 +96,7 @@ generate_syntax (const struct k_related_dialog *krd)
 
   if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal)))
     {
-      g_string_append (string, "\n\t/KENDAL = ");
+      g_string_append (string, "\n\t/KENDALL = ");
       psppire_var_view_append_names (PSPPIRE_VAR_VIEW (krd->var_view), 0, string);
     }
 
@@ -128,14 +126,11 @@ k_related_dialog (PsppireDataWindow *dw)
   struct k_related_dialog krd;
 
   GtkBuilder *xml = builder_new ("k-related.ui");
-  PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "k-related-dialog");
 
   GtkWidget *dict_view = get_widget_assert   (xml, "dict-view");
 
-  g_object_get (dw->data_editor, "var-store", &vs, NULL);
-
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (dw));
 
   krd.var_view  = get_widget_assert (xml, "variables-treeview");
@@ -144,7 +139,7 @@ k_related_dialog (PsppireDataWindow *dw)
   krd.kendal =  get_widget_assert (xml, "kendal-checkbutton");
   krd.cochran =  get_widget_assert (xml, "cochran-checkbutton");
 
-  g_object_get (vs, "dictionary", &krd.dict, NULL);
+  g_object_get (dw->data_editor, "dictionary", &krd.dict, NULL);
   g_object_set (dict_view,
                "model", krd.dict, 
                "predicate", var_is_numeric,
@@ -162,21 +157,10 @@ k_related_dialog (PsppireDataWindow *dw)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      {
-       gchar *syntax = generate_syntax (&krd);
-
-       struct getl_interface *sss = create_syntax_string_source (syntax);
-       execute_syntax (sss);
-
-       g_free (syntax);
-      }
+      g_free (execute_syntax_string (dw, generate_syntax (&krd)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
-      {
-       gchar *syntax = generate_syntax (&krd);
-       paste_syntax_to_window (syntax);
-       g_free (syntax);
-      }
+      g_free (paste_syntax_to_window (generate_syntax (&krd)));
       break;
     default:
       break;