projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
[pspp-builds.git]
/
src
/
ui
/
gui
/
weight-cases-dialog.c
diff --git
a/src/ui/gui/weight-cases-dialog.c
b/src/ui/gui/weight-cases-dialog.c
index 11b528ba76d1ebf2f3f06cea96cabad8d8eac7f9..40951360d70186658642ec2a99c701ed8e9e042c 100644
(file)
--- a/
src/ui/gui/weight-cases-dialog.c
+++ b/
src/ui/gui/weight-cases-dialog.c
@@
-120,6
+120,7
@@
weight_cases_dialog (GObject *o, gpointer data)
PsppireVarStore *vs = NULL;
g_object_get (de->data_editor, "var-store", &vs, NULL);
PsppireVarStore *vs = NULL;
g_object_get (de->data_editor, "var-store", &vs, NULL);
+ g_object_get (vs, "dictionary", &wcd.dict, NULL);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
@@
-130,21
+131,16
@@
weight_cases_dialog (GObject *o, gpointer data)
g_signal_connect (selector, "de-selected", G_CALLBACK (on_deselect),
radiobutton1);
g_signal_connect (selector, "de-selected", G_CALLBACK (on_deselect),
radiobutton1);
- g_object_set (source, "dictionary", vs->dict,
+
+ g_object_set (source, "model", wcd.dict,
"selection-mode", GTK_SELECTION_SINGLE,
"predicate", var_is_numeric,
NULL);
"selection-mode", GTK_SELECTION_SINGLE,
"predicate", var_is_numeric,
NULL);
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- entry,
- insert_source_row_into_entry,
- is_currently_in_entry,
- NULL
- );
+ psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector),
+ is_currently_in_entry);
- wcd.dict = vs->dict;
wcd.entry = GTK_ENTRY (entry);
wcd.status = GTK_LABEL (status);
wcd.off = GTK_TOGGLE_BUTTON (radiobutton1);
wcd.entry = GTK_ENTRY (entry);
wcd.status = GTK_LABEL (status);
wcd.off = GTK_TOGGLE_BUTTON (radiobutton1);