Merge commit 'savannah/master'

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

diff --git a/src/ui/gui/frequencies-dialog.c b/src/ui/gui/frequencies-dialog.c
index 295b764a0d236c3d2ae49582a5245cf071c6feff..89cf7683e890cfad1ca97697047ae29fe77be832 100644 (file)
--- a/src/ui/gui/frequencies-dialog.c
+++ b/src/ui/gui/frequencies-dialog.c
@@ -20,7 +20,6 @@
 #include "frequencies-dialog.h"
 
 #include <gtk/gtk.h>
-#include <gtksheet/gtksheet.h>
 #include <stdlib.h>
 
 #include <language/syntax-string-source.h>
@@ -148,7 +147,7 @@ generate_syntax (const struct frequencies_dialog *fd)
   GString *string = g_string_new ("FREQUENCIES");
 
   g_string_append (string, "\n\t/VARIABLES=");
-  append_variable_names (string, fd->dict, GTK_TREE_VIEW (fd->stat_vars));
+  append_variable_names (string, fd->dict, GTK_TREE_VIEW (fd->stat_vars), 0);
 
   g_string_append (string, "\n\t/FORMAT=");
 
@@ -312,7 +311,7 @@ frequencies_dialog (GObject *o, gpointer data)
 
   struct frequencies_dialog fd;
 
-  GladeXML *xml = XML_NEW ("frequencies.glade");
+  GtkBuilder *xml = builder_new ("frequencies.ui");
 
   GtkWidget *dialog = get_widget_assert   (xml, "frequencies-dialog");
   GtkWidget *source = get_widget_assert   (xml, "dict-treeview");
@@ -321,10 +320,9 @@ frequencies_dialog (GObject *o, gpointer data)
   GtkWidget *format_button = get_widget_assert (xml, "button1");
   GtkWidget *stats_treeview = get_widget_assert (xml, "stats-treeview");
 
-  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);
 
   put_checkbox_items_in_treeview (GTK_TREE_VIEW(stats_treeview),
                                  B_FS_DEFAULT,
@@ -333,8 +331,6 @@ frequencies_dialog (GObject *o, gpointer data)
                                  );
 
 
-
-
   gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
 
   attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
@@ -348,6 +344,7 @@ frequencies_dialog (GObject *o, gpointer data)
                                 source,
                                 dest,
                                 insert_source_row_into_tree_view,
+                                NULL,
                                 NULL);
 
 
@@ -371,6 +368,10 @@ frequencies_dialog (GObject *o, gpointer data)
   fd.current_opts.use_limits = FALSE;
   fd.current_opts.limit = 50;
 
+
+  gtk_window_set_transient_for (GTK_WINDOW (fd.format_dialog), de->parent.window);
+
+
   g_signal_connect (dialog, "refresh", G_CALLBACK (refresh),  &fd);
 
   psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),