projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed some calls to deprecated Gtk functions
[pspp-builds.git]
/
src
/
ui
/
gui
/
find-dialog.c
diff --git
a/src/ui/gui/find-dialog.c
b/src/ui/gui/find-dialog.c
index faeb8f6490578ad703096f40cbce96cce44886a8..d72116069884cf3a21a199a7615b8e400a8657b5 100644
(file)
--- a/
src/ui/gui/find-dialog.c
+++ b/
src/ui/gui/find-dialog.c
@@
-207,7
+207,7
@@
find_dialog (GObject *o, gpointer data)
buttonbox = get_widget_assert (fd.xml, "find-buttonbox");
buttonbox = get_widget_assert (fd.xml, "find-buttonbox");
-
gtk
_box_pack_start_defaults (GTK_BOX (buttonbox), find_button);
+
psppire
_box_pack_start_defaults (GTK_BOX (buttonbox), find_button);
gtk_box_reorder_child (GTK_BOX (buttonbox), find_button, 0);
dialog = get_widget_assert (fd.xml, "find-dialog");
gtk_box_reorder_child (GTK_BOX (buttonbox), find_button, 0);
dialog = get_widget_assert (fd.xml, "find-dialog");
@@
-219,7
+219,8
@@
find_dialog (GObject *o, gpointer data)
"data-store", &ds,
NULL);
"data-store", &ds,
NULL);
- fd.dict = vs->dict;
+ g_object_get (vs, "dictionary", &fd.dict, NULL);
+
fd.data = ds->datasheet;
fd.variable_entry = get_widget_assert (fd.xml, "find-variable-entry");
fd.data = ds->datasheet;
fd.variable_entry = get_widget_assert (fd.xml, "find-variable-entry");
@@
-241,17
+242,13
@@
find_dialog (GObject *o, gpointer data)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- g_object_set (source, "
dictionary
", fd.dict,
+ g_object_set (source, "
model
", fd.dict,
"selection-mode", GTK_SELECTION_SINGLE,
NULL);
"selection-mode", GTK_SELECTION_SINGLE,
NULL);
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- fd.variable_entry,
- insert_source_row_into_entry,
- is_currently_in_entry,
- NULL
- );
+
+ psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector),
+ is_currently_in_entry);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &fd);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &fd);
@@
-585,8
+582,6
@@
cmptr_value_destroy (struct comparator *cmptr)
static struct comparator *
value_comparator_create (const struct variable *var, const PsppireDict *dict, const char *target)
{
static struct comparator *
value_comparator_create (const struct variable *var, const PsppireDict *dict, const char *target)
{
- const struct fmt_spec *fmt;
- int width ;
struct value_comparator *vc = xzalloc (sizeof (*vc));
struct comparator *cmptr = (struct comparator *) vc;
struct value_comparator *vc = xzalloc (sizeof (*vc));
struct comparator *cmptr = (struct comparator *) vc;
@@
-596,12
+591,7
@@
value_comparator_create (const struct variable *var, const PsppireDict *dict, co
cmptr->destroy = cmptr_value_destroy;
cmptr->dict = dict;
cmptr->destroy = cmptr_value_destroy;
cmptr->dict = dict;
- width = var_get_width (var);
- fmt = var_get_write_format (var);
-
- value_init (&vc->pattern, width);
-
- text_to_value (target, &vc->pattern, dict, *var_get_write_format (var) );
+ text_to_value (target, dict, var, &vc->pattern);
return cmptr;
}
return cmptr;
}