gui: Make syntax execution functions take a PsppireDataWindow argument.

[pspp-builds.git] / src / ui / gui / recode-dialog.c

diff --git a/src/ui/gui/recode-dialog.c b/src/ui/gui/recode-dialog.c
index 33fa76eb86e72d725392cb5a858d5314844f069b..55376644f1b00cda4f80431ec175cab1baa5be66 100644 (file)
--- a/src/ui/gui/recode-dialog.c
+++ b/src/ui/gui/recode-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009  Free Software Foundation
+   Copyright (C) 2007, 2009, 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
@@ -31,7 +31,6 @@
 #include <gtk/gtk.h>
 
 #include <xalloc.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>
@@ -801,30 +800,6 @@ on_change_clicked (GObject *obj, gpointer data)
 }
 
 
-/* If there's nothing selected in the variable treeview,
-   then automatically select the first item */
-static void
-select_something (GtkTreeModel *treemodel,
-                 GtkTreePath  *arg1,
-                 GtkTreeIter  *arg2,
-                 gpointer      data)
-{
-  struct recode_dialog *rd = data;
-  GtkTreeSelection *sel;
-
-  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (rd->variable_treeview));
-
-  if ( gtk_tree_selection_count_selected_rows (sel) < 1)
-    {
-      GtkTreeIter iter;
-
-      gtk_tree_model_get_iter_first   (treemodel, &iter);
-
-      gtk_tree_selection_select_iter  (sel, &iter);
-    }
-}
-
-
 /* Callback for the new_value_entry and new_value_togglebutton widgets.
    It's used to enable/disable the acr. */
 static void
@@ -921,7 +896,6 @@ recode_dialog (PsppireDataWindow *de, gboolean diff)
 
   if (rd.different)
     {
-      GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd.variable_treeview)->list);
       GtkTreeSelection *sel;
 
       GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
@@ -1085,22 +1059,10 @@ recode_dialog (PsppireDataWindow *de, gboolean diff)
   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;