repair glade; switched to gladeui-2.0; removed the internal-child in psppire-dialog.

[pspp] / src / ui / gui / psppire-dialog-action-means.c

diff --git a/src/ui/gui/psppire-dialog-action-means.c b/src/ui/gui/psppire-dialog-action-means.c
index 8d378e221a76ac1931b6b08dba8620e810bdc794..807d3fc38b9c6c9709c04884b4e279eebbfa0527 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-means.c
+++ b/src/ui/gui/psppire-dialog-action-means.c
@@ -47,22 +47,21 @@ generate_syntax (PsppireDialogAction *act)
 
   for (l = 0; l < layer->n_layers; ++l)
     {
-      gboolean ok;
       GtkTreeIter iter;
-      PsppireVarView *vv = PSPPIRE_VAR_VIEW (layer->var_view);
-      psppire_var_view_set_current_model (vv, l);
-      g_string_append (string, "\n\tBY");
-      for (ok = psppire_var_view_get_iter_first (vv, &iter);
-          ok;
-          ok = psppire_var_view_get_iter_next (vv, &iter))
+
+      GtkTreeModel *m = psppire_means_layer_get_model_n (layer, l);
+      gboolean ok = gtk_tree_model_get_iter_first (m, &iter);
+      if (ok)
+       g_string_append (string, "\n\tBY");
+      for (; ok; ok = gtk_tree_model_iter_next (m, &iter))
          {
-           const struct variable *var = psppire_var_view_get_variable (vv, 0, &iter);
+           const struct variable *var = psppire_var_view_get_var_from_model (m, 0, &iter);
            g_string_append (string, " ");
            g_string_append (string, var_get_name (var));
          }
     }
 
-  g_string_append (string, ".");
+  g_string_append (string, ".\n");
   text = string->str;
 
   g_string_free (string, FALSE);
@@ -101,6 +100,8 @@ psppire_dialog_action_means_activate (GtkAction *a)
   GtkBuilder *xml = builder_new ("means.ui");
 
   GtkWidget *vb =   get_widget_assert   (xml, "alignment3");
+  GtkWidget *selector = get_widget_assert   (xml, "layer-selector");
+  
   act->layer = psppire_means_layer_new ();
   gtk_container_add (GTK_CONTAINER (vb), act->layer);
   gtk_widget_show (act->layer);
@@ -110,16 +111,20 @@ psppire_dialog_action_means_activate (GtkAction *a)
   act->variables = get_widget_assert   (xml, "stat-variables");
 
   g_object_set (pda->source,
-               "model", pda->dict,
                "predicate", var_is_numeric,
                NULL);
 
-  psppire_means_layer_set_source (PSPPIRE_MEANS_LAYER (act->layer), pda->source);
+  g_object_set (selector,
+               "dest-widget", act->layer,
+               NULL);
+
 
   psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, dialog_refresh);
 
   PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_means_parent_class)->activate (pda);
+
+  g_object_unref (xml);
 }
 
 static void