X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Frank-dialog.c;h=157f213609dc3ccc8d4f517a74649c00eba4df1b;hb=b94025a12799b6826a772731b8f58907dca2cf5c;hp=bf44dced6464fbc0c73246b71a6ad9734047db39;hpb=b40f8032efcf6099f665ce8e7c0669bf0e9d655e;p=pspp-builds.git

diff --git a/src/ui/gui/rank-dialog.c b/src/ui/gui/rank-dialog.c
index bf44dced..157f2136 100644
--- a/src/ui/gui/rank-dialog.c
+++ b/src/ui/gui/rank-dialog.c
@@ -22,13 +22,13 @@
 #include <stdlib.h>
 
 #include <language/syntax-string-source.h>
-#include <ui/gui/data-editor.h>
+#include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
 #include <ui/gui/helper.h>
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
-#include <ui/gui/syntax-editor.h>
+#include "executor.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -220,7 +220,7 @@ void
 rank_dialog (GObject *o, gpointer data)
 {
   gint response;
-  struct data_editor *de = data;
+  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   struct rank_dialog rd;
 
@@ -238,7 +238,7 @@ rank_dialog (GObject *o, gpointer data)
 
   g_object_get (de->data_editor, "var-store", &vs, NULL);
 
-  rd.dict = vs->dict;
+  g_object_get (vs, "dictionary", &rd.dict, NULL);
   rd.rank_vars =   get_widget_assert (builder, "variables-treeview");
   rd.group_vars =  get_widget_assert (builder, "group-vars-treeview");
   rd.dialog = get_widget_assert   (builder, "rank-dialog");
@@ -304,29 +304,20 @@ rank_dialog (GObject *o, gpointer data)
 		    G_CALLBACK (on_ntiles_toggle),
 		    rd.ntiles_entry);
 
-  gtk_window_set_transient_for (GTK_WINDOW (rd.dialog), de->parent.window);
+  gtk_window_set_transient_for (GTK_WINDOW (rd.dialog), GTK_WINDOW (de));
 
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (vars),
-				 vs->dict,
-				 GTK_SELECTION_MULTIPLE, NULL);
+  g_object_set (vars, "model", rd.dict, NULL);
 
+  set_dest_model (GTK_TREE_VIEW (rd.rank_vars), rd.dict);
 
-  set_dest_model (GTK_TREE_VIEW (rd.rank_vars), vs->dict);
-
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
-				 vars,
-				 rd.rank_vars,
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector1),
 				 insert_source_row_into_tree_view,
-				 NULL,
 				 NULL);
 
-  set_dest_model (GTK_TREE_VIEW (rd.group_vars), vs->dict);
+  set_dest_model (GTK_TREE_VIEW (rd.group_vars), rd.dict);
 
-  psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
-				 vars,
-				 rd.group_vars,
+  psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector2),
 				 insert_source_row_into_tree_view,
-				 NULL,
 				 NULL);
 
 
@@ -349,6 +340,7 @@ rank_dialog (GObject *o, gpointer data)
     case GTK_RESPONSE_OK:
       {
 	gchar *syntax = generate_syntax (&rd);
+
 	struct getl_interface *sss = create_syntax_string_source (syntax);
 	execute_syntax (sss);
 
@@ -358,12 +350,7 @@ rank_dialog (GObject *o, gpointer data)
     case PSPPIRE_RESPONSE_PASTE:
       {
 	gchar *syntax = generate_syntax (&rd);
-
-	struct syntax_editor *se =
-	  (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
-	gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
-
+	paste_syntax_in_new_window (syntax);
 	g_free (syntax);
       }
       break;