X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fcompute-dialog.c;h=5d40d21639bbe68fd9d06d6ea35dd9f50fba4a40;hb=ddd7c113f3e50c8d87f6a677856799d05a1f40c7;hp=3e8677ba48fd95863555e9bb84de59ef30b7146f;hpb=6882ff1359de0c4812a62e1bfcdfbf8e68474de5;p=pspp

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index 3e8677ba48..5d40d21639 100644
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -21,7 +21,6 @@
 #include "psppire-dialog.h"
 #include "psppire-keypad.h"
 #include "data-editor.h"
-#include <gtksheet/gtksheet.h>
 #include "psppire-var-store.h"
 #include "dialog-common.h"
 #include "dict-display.h"
@@ -325,10 +324,15 @@ on_expression_toggle (GtkToggleButton *button, gpointer data)
 	(GTK_ENTRY (get_widget_assert (cd->xml, "compute-entry1")));
 
       target_var = psppire_dict_lookup_var (cd->dict, target_name);
-      label = var_get_label (target_var);
+      if ( target_var )
+	{
+	  label = var_get_label (target_var);
 
-      if ( label )
-	gtk_entry_set_text (GTK_ENTRY (entry), label);
+	  if ( label )
+	    gtk_entry_set_text (GTK_ENTRY (entry), label);
+	}
+      else
+	gtk_entry_set_text (GTK_ENTRY (entry), "");
 
       gtk_widget_set_sensitive (entry, TRUE);
     }
@@ -363,7 +367,7 @@ compute_dialog (GObject *o, gpointer data)
   gint response;
   struct data_editor *de = data;
 
-  PsppireVarStore *vs;
+  PsppireVarStore *vs = NULL;
   struct compute_dialog scd;
 
   GladeXML *xml = XML_NEW ("psppire.glade");
@@ -383,12 +387,7 @@ compute_dialog (GObject *o, gpointer data)
 	get_widget_assert (xml, "radio-button-expression-label");
 
 
-  GtkSheet *var_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
-  vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
-
-
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
   scd.dict = vs->dict;
   scd.use_type = FALSE;
 
@@ -475,9 +474,9 @@ compute_dialog (GObject *o, gpointer data)
 
 
 enum {
-  COL_NAME,
-  COL_USAGE,
-  COL_ARITY
+  COMPUTE_COL_NAME,
+  COMPUTE_COL_USAGE,
+  COMPUTE_COL_ARITY
 };
 
 
@@ -499,9 +498,9 @@ function_list_populate (GtkTreeView *tv)
       gtk_list_store_append (liststore, &iter);
 
       gtk_list_store_set (liststore, &iter,
-			  COL_NAME, expr_operation_get_name (op),
-			  COL_USAGE, expr_operation_get_prototype (op),
-			  COL_ARITY, expr_operation_get_arg_cnt (op),
+			  COMPUTE_COL_NAME, expr_operation_get_name (op),
+			  COMPUTE_COL_USAGE, expr_operation_get_prototype (op),
+			  COMPUTE_COL_ARITY, expr_operation_get_arg_cnt (op),
 			  -1);
     }
 
@@ -522,7 +521,7 @@ function_list_populate (GtkTreeView *tv)
 
     gtk_tree_view_column_pack_start (col, renderer, TRUE);
 
-    gtk_tree_view_column_add_attribute (col, renderer, "text", COL_USAGE);
+    gtk_tree_view_column_add_attribute (col, renderer, "text", COMPUTE_COL_USAGE);
   }
 
   gtk_tree_view_set_model (tv, GTK_TREE_MODEL (liststore));
@@ -550,8 +549,8 @@ insert_function_into_syntax_area (GtkTreeIter iter,
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
 
-  gtk_tree_model_get_value (model, &iter, COL_NAME, &name_value);
-  gtk_tree_model_get_value (model, &iter, COL_ARITY, &arity_value);
+  gtk_tree_model_get_value (model, &iter, COMPUTE_COL_NAME, &name_value);
+  gtk_tree_model_get_value (model, &iter, COMPUTE_COL_ARITY, &arity_value);
 
   arity = g_value_get_int (&arity_value);