Means Dialog: Fix issue where the wrong syntax was generated.

[pspp] / src / ui / gui / dict-display.c

diff --git a/src/ui/gui/dict-display.c b/src/ui/gui/dict-display.c
index 77da88bd98826c9791151af09edccc4de1d9b186..cb46ad5716eaf7bd2d6c2a90f243ba799332e2ef 100644 (file)
--- a/src/ui/gui/dict-display.c
+++ b/src/ui/gui/dict-display.c
@@ -24,6 +24,7 @@
 
 #include "psppire-dict.h"
 #include "psppire-dictview.h"
+#include "psppire-means-layer.h"
 #include "psppire-var-ptr.h"
 #include "psppire-var-view.h"
 #include "psppire-select-dest.h"
@@ -87,23 +88,22 @@ insert_source_row_into_entry (GtkTreeIter iter,
 }
 
 
-void
-insert_source_row_into_tree_view (GtkTreeIter iter,
-                                 GtkWidget *dest,
-                                 GtkTreeModel *model,
-                                 gpointer data
-                                 )
+
+static void
+insert_source_row_into_tree_model (GtkTreeIter source_iter,
+                                    GtkTreeModel *dest_model,
+                                    GtkTreeModel *source_model,
+                                    gpointer data)
 {
   GtkTreePath *path;
   GtkTreeIter dest_iter;
   GtkTreeIter dict_iter;
   gint *row ;
-  GtkTreeModel *destmodel = gtk_tree_view_get_model (GTK_TREE_VIEW (dest));
 
   const struct variable *var;
   GtkTreeModel *dict;
 
-  get_base_model (model, &iter, &dict, &dict_iter);
+  get_base_model (source_model, &source_iter, &dict, &dict_iter);
 
   path = gtk_tree_model_get_path (dict, &dict_iter);
 
@@ -111,15 +111,43 @@ insert_source_row_into_tree_view (GtkTreeIter iter,
 
   var = psppire_dict_get_variable (PSPPIRE_DICT (dict), *row);
 
-  gtk_list_store_append (GTK_LIST_STORE (destmodel),  &dest_iter);
+  gtk_list_store_append (GTK_LIST_STORE (dest_model),  &dest_iter);
 
-  gtk_list_store_set (GTK_LIST_STORE (destmodel), &dest_iter, 0, var, -1);
+  gtk_list_store_set (GTK_LIST_STORE (dest_model), &dest_iter, 0, var, -1);
 
   gtk_tree_path_free (path);
 }
 
 
 
+void
+insert_source_row_into_tree_view (GtkTreeIter iter,
+                                 GtkWidget *dest,
+                                 GtkTreeModel *model,
+                                 gpointer data)
+{
+  GtkTreeModel *destmodel = gtk_tree_view_get_model (GTK_TREE_VIEW (dest));
+
+  insert_source_row_into_tree_model (iter, destmodel, model, data);
+}
+
+
+void
+insert_source_row_into_layers (GtkTreeIter iter,
+                              GtkWidget *dest,
+                              GtkTreeModel *model,
+                              gpointer data)
+{
+  GtkTreeModel *destmodel = psppire_means_layer_get_model (PSPPIRE_MEANS_LAYER (dest));
+
+  insert_source_row_into_tree_model (iter, destmodel, model, data);
+
+  psppire_means_layer_update (PSPPIRE_MEANS_LAYER (dest));
+}
+
+
+
+
 gboolean
 is_currently_in_entry (GtkTreeModel *model, GtkTreeIter *iter,
                       PsppireSelector *selector)