X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fweight-cases-dialog.c;h=b3087159f941adf7d16b7d2dc1d66f7165ee38d5;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=121a523dae5ec5b099444cd8df0b30a8b2aa1330;hpb=c7b5e2dcfaeb0221b801dc3cc9fa1ab9a4ec5861;p=pspp-builds.git

diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c
index 121a523d..b3087159 100644
--- a/src/ui/gui/weight-cases-dialog.c
+++ b/src/ui/gui/weight-cases-dialog.c
@@ -19,14 +19,13 @@
 #include "weight-cases-dialog.h"
 #include "psppire-selector.h"
 #include "psppire-dialog.h"
-#include "helper.h"
+#include "executor.h"
 #include "psppire-data-window.h"
 #include "dict-display.h"
 #include <language/syntax-string-source.h>
-#include "psppire-syntax-window.h"
+#include "helper.h"
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -107,7 +106,7 @@ weight_cases_dialog (GObject *o, gpointer data)
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   struct weight_cases_dialog wcd;
 
-  GladeXML *xml = XML_NEW ("psppire.glade");
+  GtkBuilder *xml = builder_new ("psppire.ui");
 
   GtkWidget *dialog = get_widget_assert (xml, "weight-cases-dialog");
   GtkWidget *source = get_widget_assert (xml, "weight-cases-treeview");
@@ -121,6 +120,7 @@ weight_cases_dialog (GObject *o, gpointer data)
   PsppireVarStore *vs = NULL;
 
   g_object_get (de->data_editor, "var-store", &vs,  NULL);
+  g_object_get (vs, "dictionary", &wcd.dict, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
@@ -131,11 +131,11 @@ weight_cases_dialog (GObject *o, gpointer data)
   g_signal_connect (selector, "de-selected", G_CALLBACK (on_deselect),
 		    radiobutton1);
 
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
-				 vs->dict,
-				 GTK_SELECTION_SINGLE,
-				 var_is_numeric
-				 );
+  
+  g_object_set (source, "dictionary", wcd.dict,
+				 "selection-mode", GTK_SELECTION_SINGLE,
+				 "predicate", var_is_numeric,
+				 NULL);
 
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
 				 source,
@@ -146,7 +146,7 @@ weight_cases_dialog (GObject *o, gpointer data)
 				 );
 
 
-  wcd.dict = vs->dict;
+
   wcd.entry = GTK_ENTRY (entry);
   wcd.status = GTK_LABEL (status);
   wcd.off = GTK_TOGGLE_BUTTON (radiobutton1);
@@ -172,13 +172,7 @@ weight_cases_dialog (GObject *o, gpointer data)
     case PSPPIRE_RESPONSE_PASTE:
       {
 	gchar *syntax = generate_syntax (&wcd);
-
-        GtkWidget *se = psppire_syntax_window_new ();
-
-	gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
-	gtk_widget_show (se);
-
+        paste_syntax_in_new_window (syntax);
 	g_free (syntax);
       }
       break;