X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-means.c;h=81e9bb905216d1f414840d7b365b7ff118def8cf;hb=refs%2Fbuilds%2F20140222033038%2Fpspp;hp=1ec9fccffb51e20cef5c28a53e1e2f4e0ba24771;hpb=90d86f274e3f497ae75739170f0e2e45ffcaa19c;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-means.c b/src/ui/gui/psppire-dialog-action-means.c index 1ec9fccffb..81e9bb9052 100644 --- 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); @@ -110,7 +109,6 @@ 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);