Remove unnecessary dependencies on gtksheet.h

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

diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c
index 4697c9fdfa073308f08fc1ef823519537f90af97..7b33eae21026e454362cbb238f15c828034b21ff 100644 (file)
--- a/src/ui/gui/descriptives-dialog.c
+++ b/src/ui/gui/descriptives-dialog.c
@@ -20,7 +20,6 @@
 #include "descriptives-dialog.h"
 
 #include <gtk/gtk.h>
-#include <gtksheet/gtksheet.h>
 #include <stdlib.h>
 
 #include <language/syntax-string-source.h>
@@ -118,7 +117,7 @@ generate_syntax (const struct descriptives_dialog *scd)
 
   string = g_string_new ("DESCRIPTIVES");
   g_string_append (string, "\n    /VARIABLES=");
-  append_variable_names (string, scd->dict, GTK_TREE_VIEW (scd->stat_vars));
+  append_variable_names (string, scd->dict, GTK_TREE_VIEW (scd->stat_vars), 0);
 
   listwise = gtk_toggle_button_get_active (scd->exclude_missing_listwise);
   include = gtk_toggle_button_get_active (scd->include_user_missing);
@@ -218,10 +217,9 @@ descriptives_dialog (GObject *o, gpointer data)
 
   GtkWidget *stats_treeview = get_widget_assert    (xml, "statistics");
 
-  GtkSheet *var_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+  PsppireVarStore *vs = NULL;
 
-  PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
 
@@ -235,6 +233,7 @@ descriptives_dialog (GObject *o, gpointer data)
                                 source,
                                 dest,
                                 insert_source_row_into_tree_view,
+                                NULL,
                                 NULL);
 
   put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),