X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcompute-dialog.c;h=9eafc2c2b84e3be47dab73660a088fbc9c4e17e7;hb=f606d3c31ea117f7b9cb187f3521c7051a8db2ba;hp=3386680d35163a2ad6d107e8b3c018402dad9f21;hpb=6063e91bfb952c369ca3343928ed30f53d1f0bdd;p=pspp

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index 3386680d35..9eafc2c2b8 100644
--- 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);
     }
@@ -399,6 +411,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 +420,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);
 
 
@@ -525,7 +539,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;
@@ -588,7 +603,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;