X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcompute-dialog.c;h=7703640c4d553e81eb6584f28eb46841a0c3fe21;hb=0f70b0dd47b62dbefe87fb08ba8a8984aa5a50c4;hp=96ea6630885b08fedf74a9b42d655fa94e18f333;hpb=4c4f035bfad520dc54f0d5a9e30e36d4fb009efc;p=pspp-builds.git

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index 96ea6630..7703640c 100644
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -22,8 +22,8 @@
 #include "psppire-keypad.h"
 #include "psppire-data-window.h"
 #include "psppire-var-store.h"
+#include "psppire-selector.h"
 #include "dialog-common.h"
-#include "dict-display.h"
 
 #include <language/expressions/public.h>
 #include <language/syntax-string-source.h>
@@ -47,7 +47,7 @@ static void insert_source_row_into_text_view (GtkTreeIter iter,
 
 struct compute_dialog
 {
-  GladeXML *xml;  /* The xml that generated the widgets */
+  GtkBuilder *xml;  /* The xml that generated the widgets */
   PsppireDict *dict;
   gboolean use_type;
 };
@@ -113,7 +113,7 @@ erase_selection (GtkTextBuffer *buffer)
 static void
 on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data)
 {
-  GladeXML *xml = data;
+  GtkBuilder *xml = data;
 
   GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
 
@@ -137,7 +137,7 @@ on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data)
 static void
 erase (PsppireKeypad *kp, gpointer data)
 {
-  GladeXML *xml = data;
+  GtkBuilder *xml = data;
 
   GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
 
@@ -370,7 +370,7 @@ compute_dialog (GObject *o, gpointer data)
   PsppireVarStore *vs = NULL;
   struct compute_dialog scd;
 
-  GladeXML *xml = XML_NEW ("psppire.glade");
+  GtkBuilder *xml = builder_new ("psppire.ui");
 
   GtkWidget *dialog = get_widget_assert   (xml, "compute-variable-dialog");
 
@@ -396,11 +396,10 @@ compute_dialog (GObject *o, gpointer data)
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
-
-  attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
-				 vs->dict,
-				 GTK_SELECTION_SINGLE, NULL);
-
+  g_object_set (dict_view,
+		"dictionary", vs->dict,
+		"selection-mode", GTK_SELECTION_SINGLE,
+		NULL);
 
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
 				 dict_view, syntax_area,