Applied patch #6428

[pspp-builds.git] / src / ui / gui / compute-dialog.c

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index 3386680d35163a2ad6d107e8b3c018402dad9f21..c8ee114e1693cd37fa49d99de8c0e35a405cad25 100644 (file)
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -34,12 +34,14 @@ static void function_list_populate (GtkTreeView *tv);
 
 static void insert_function_into_syntax_area (GtkTreeIter iter,
                                              GtkWidget *text_view,
-                                             GtkTreeModel *model
+                                             GtkTreeModel *model,
+                                             gpointer data
                                              );
 
 static void insert_source_row_into_text_view (GtkTreeIter iter,
                                              GtkWidget *dest,
-                                             GtkTreeModel *model
+                                             GtkTreeModel *model,
+                                             gpointer data
                                              );
 
 
@@ -151,7 +153,7 @@ generate_syntax (const struct compute_dialog *cd)
   gchar *text;
   GString *string ;
   const gchar *target_name ;
-  const gchar *expression;
+  gchar *expression;
   const gchar *label;
   GtkTextIter start, end;
   GtkWidget *target = get_widget_assert   (cd->xml, "compute-entry1");
@@ -176,7 +178,7 @@ generate_syntax (const struct compute_dialog *cd)
 
   string = g_string_sized_new (64);
 
-  if ( cd-> use_type && 
+  if ( cd-> use_type &&
        NULL == psppire_dict_lookup_var (cd->dict, target_name ))
     {
       if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (string_toggle)))
@@ -199,11 +201,16 @@ generate_syntax (const struct compute_dialog *cd)
                            target_name,
                            label);
 
-  g_string_append_printf (string, "COMPUTE %s = %s.",
+  g_string_append_printf (string, "COMPUTE %s = %s.\n",
                          target_name,
                          expression
                          );
 
+  g_string_append (string, "EXECUTE.\n");
+
+
+  g_free (expression);
+
   text = string->str;
 
   g_string_free (string, FALSE);
@@ -318,10 +325,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);
     }
@@ -356,7 +368,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");
@@ -376,12 +388,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;
 
@@ -399,6 +406,7 @@ compute_dialog (GObject *o, gpointer data)
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
                                 dict_view, syntax_area,
                                 insert_source_row_into_text_view,
+                                NULL,
                                 NULL);
 
 
@@ -407,6 +415,7 @@ compute_dialog (GObject *o, gpointer data)
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector),
                                 functions, syntax_area,
                                 insert_function_into_syntax_area,
+                                NULL,
                                 NULL);
 
 
@@ -466,9 +475,9 @@ compute_dialog (GObject *o, gpointer data)
 
 
 enum {
-  COL_NAME,
-  COL_USAGE,
-  COL_ARITY
+  COMPUTE_COL_NAME,
+  COMPUTE_COL_USAGE,
+  COMPUTE_COL_ARITY
 };
 
 
@@ -490,9 +499,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);
     }
 
@@ -513,7 +522,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));
@@ -525,7 +534,8 @@ function_list_populate (GtkTreeView *tv)
 static void
 insert_function_into_syntax_area (GtkTreeIter iter,
                                  GtkWidget *text_view,
-                                 GtkTreeModel *model
+                                 GtkTreeModel *model,
+                                 gpointer data
                                  )
 {
   GString *string;
@@ -540,8 +550,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);
 
@@ -588,7 +598,8 @@ insert_function_into_syntax_area (GtkTreeIter iter,
 static void
 insert_source_row_into_text_view (GtkTreeIter iter,
                                  GtkWidget *dest,
-                                 GtkTreeModel *model
+                                 GtkTreeModel *model,
+                                 gpointer data
                                  )
 {
   GtkTreePath *path;