X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fsort-cases-dialog.c;h=4c83676f212e5f1c26784a006d647236d5e5fd66;hb=46dfa3ec7417bbb7452f152a6b62435006259633;hp=0eb0eaa678119166e44d8d5ff0d6c5f52c92bf9d;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git

diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c
index 0eb0eaa6..4c83676f 100644
--- a/src/ui/gui/sort-cases-dialog.c
+++ b/src/ui/gui/sort-cases-dialog.c
@@ -20,7 +20,6 @@
 #include "helper.h"
 #include "psppire-dialog.h"
 #include "data-editor.h"
-#include <gtksheet/gtksheet.h>
 #include "psppire-var-store.h"
 #include "dialog-common.h"
 #include "dict-display.h"
@@ -45,13 +44,28 @@ struct sort_cases_dialog
   GtkToggleButton *ascending;
 };
 
+
+static gboolean
+dialog_state_valid (gpointer data)
+{
+  struct sort_cases_dialog *scd = data;
+  GtkTreeModel *model = gtk_tree_view_get_model (scd->tv);
+
+  gint n_rows = gtk_tree_model_iter_n_children  (model, NULL);
+
+  if ( n_rows == 0 )
+    return FALSE;
+
+  return TRUE;
+}
+
 static char *
 generate_syntax (const struct sort_cases_dialog *scd)
 {
   gchar *text;
   GString *string = g_string_new ("SORT CASES BY ");
   gint n_vars = append_variable_names (string,
-				       scd->dict, GTK_TREE_VIEW (scd->tv));
+				       scd->dict, GTK_TREE_VIEW (scd->tv), 0);
 
   if ( n_vars == 0 )
     g_string_assign (string, "");
@@ -90,10 +104,9 @@ sort_cases_dialog (GObject *o, gpointer data)
   GtkWidget *selector = get_widget_assert (xml, "sort-cases-selector");
   GtkWidget *dest =   get_widget_assert   (xml, "sort-cases-treeview2");
 
-  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);
 
@@ -107,6 +120,7 @@ sort_cases_dialog (GObject *o, gpointer data)
 				 source,
 				 dest,
 				 insert_source_row_into_tree_view,
+				 NULL,
 				 NULL);
 
   g_signal_connect (dialog, "refresh", G_CALLBACK (refresh),  dest);
@@ -116,6 +130,11 @@ sort_cases_dialog (GObject *o, gpointer data)
   scd.ascending =
     GTK_TOGGLE_BUTTON (get_widget_assert (xml, "sort-cases-radiobutton0"));
 
+
+  psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+				      dialog_state_valid, &scd);
+
+
   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));