projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Make syntax execution functions take a PsppireDataWindow argument.
[pspp-builds.git]
/
src
/
ui
/
gui
/
text-data-import-dialog.c
diff --git
a/src/ui/gui/text-data-import-dialog.c
b/src/ui/gui/text-data-import-dialog.c
index 534cec9e0884450bc4a3bfc49200c9b0d428ef15..ee42b7d8894e43ee57ca0ef51a2b9efa8ddbd3c3 100644
(file)
--- a/
src/ui/gui/text-data-import-dialog.c
+++ b/
src/ui/gui/text-data-import-dialog.c
@@
-232,8
+232,9
@@
static void pop_watch_cursor (struct import_assistant *);
/* Pops up the Text Data Import assistant. */
void
/* Pops up the Text Data Import assistant. */
void
-text_data_import_assistant (
GtkWindow *parent_windo
w)
+text_data_import_assistant (
PsppireDataWindow *d
w)
{
{
+ GtkWindow *parent_window = GTK_WINDOW (dw);
struct import_assistant *ia;
ia = xzalloc (sizeof *ia);
struct import_assistant *ia;
ia = xzalloc (sizeof *ia);
@@
-258,7
+259,7
@@
text_data_import_assistant (GtkWindow *parent_window)
switch (ia->asst.response)
{
case GTK_RESPONSE_APPLY:
switch (ia->asst.response)
{
case GTK_RESPONSE_APPLY:
- free (execute_syntax_string (generate_syntax (ia)));
+ free (execute_syntax_string (
dw,
generate_syntax (ia)));
break;
case PSPPIRE_RESPONSE_PASTE:
free (paste_syntax_to_window (generate_syntax (ia)));
break;
case PSPPIRE_RESPONSE_PASTE:
free (paste_syntax_to_window (generate_syntax (ia)));
@@
-330,7
+331,7
@@
apply_dict (const struct dictionary *dict, struct string *s)
ds_put_cstr (s, "\n ");
syntax_gen_value (s, &vl->value, width, format);
ds_put_byte (s, ' ');
ds_put_cstr (s, "\n ");
syntax_gen_value (s, &vl->value, width, format);
ds_put_byte (s, ' ');
- syntax_gen_string (s, ss_cstr (val_lab_get_label (vl)));
+ syntax_gen_string (s, ss_cstr (val_lab_get_
escaped_
label (vl)));
}
free (labels);
ds_put_cstr (s, ".\n");
}
free (labels);
ds_put_cstr (s, ".\n");
@@
-872,7
+873,7
@@
create_lines_tree_view (GtkContainer *parent, struct import_assistant *ia)
size_t max_line_length;
gint content_width, header_width;
size_t i;
size_t max_line_length;
gint content_width, header_width;
size_t i;
- gchar *title = _("Text");
+
const
gchar *title = _("Text");
make_tree_view (ia, 0, &tree_view);
make_tree_view (ia, 0, &tree_view);
@@
-1252,7
+1253,7
@@
choose_column_names (struct import_assistant *ia)
struct column *col;
size_t name_row;
struct column *col;
size_t name_row;
- dict = dict_create ();
+ dict = dict_create (
get_default_encoding ()
);
name_row = f->variable_names && f->skip_lines ? f->skip_lines : 0;
for (col = s->columns; col < &s->columns[s->column_cnt]; col++)
{
name_row = f->variable_names && f->skip_lines ? f->skip_lines : 0;
for (col = s->columns; col < &s->columns[s->column_cnt]; col++)
{
@@
-1595,7
+1596,7
@@
prepare_formats_page (struct import_assistant *ia)
push_watch_cursor (ia);
push_watch_cursor (ia);
- dict = dict_create ();
+ dict = dict_create (
get_default_encoding ()
);
fg = fmt_guesser_create ();
for (column_idx = 0; column_idx < s->column_cnt; column_idx++)
{
fg = fmt_guesser_create ();
for (column_idx = 0; column_idx < s->column_cnt; column_idx++)
{