X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdescriptives-dialog.c;h=1b49d92130839f9db49f0d3cc8d57390043bd1b7;hb=7c2fa3735ac1115b6c1ad4b5e0613673de2faf4c;hp=a867fe016d05131f0ff759e3536118c5ae60c855;hpb=9e0e4996fad6563f0a1ce628b80db5c23ef8279e;p=pspp-builds.git diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c index a867fe01..1b49d921 100644 --- a/src/ui/gui/descriptives-dialog.c +++ b/src/ui/gui/descriptives-dialog.c @@ -206,7 +206,7 @@ descriptives_dialog (GObject *o, gpointer data) struct descriptives_dialog scd; - GtkBuilder *xml = builder_new ("descriptives-dialog.ui"); + GtkBuilder *xml = builder_new ("descriptives.ui"); GtkWidget *dialog = get_widget_assert (xml, "descriptives-dialog"); @@ -218,20 +218,20 @@ descriptives_dialog (GObject *o, gpointer data) GtkWidget *stats_treeview = get_widget_assert (xml, "statistics"); PsppireVarStore *vs = NULL; + PsppireDict *dict; g_object_get (de->data_editor, "var-store", &vs, NULL); + g_object_get (vs, "dictionary", &dict, NULL); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de)); - g_object_set (source, "dictionary", vs->dict, - "predicate", var_is_numeric, NULL); - set_dest_model (GTK_TREE_VIEW (dest), vs->dict); + g_object_set (source, "dictionary", dict, + "predicate", var_is_numeric, NULL); + set_dest_model (GTK_TREE_VIEW (dest), dict); psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector), - source, - dest, insert_source_row_into_tree_view, NULL, NULL); @@ -242,7 +242,9 @@ descriptives_dialog (GObject *o, gpointer data) scd.stat_vars = GTK_TREE_VIEW (dest); scd.stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview)); - scd.dict = vs->dict; + + g_object_get (vs, "dictionary", &scd.dict, NULL); + scd.include_user_missing = GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing")); scd.exclude_missing_listwise =