projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the recommended gnulib commit, since it contains an important w32 fix
[pspp]
/
src
/
ui
/
gui
/
psppire-data-store.c
diff --git
a/src/ui/gui/psppire-data-store.c
b/src/ui/gui/psppire-data-store.c
index 9833fb496f8a0be6dd3145fc7bbb334fe46b341f..2fabf4d5d423466179a4bc6d9c39cb2f33302c46 100644
(file)
--- a/
src/ui/gui/psppire-data-store.c
+++ b/
src/ui/gui/psppire-data-store.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006, 2008, 2009 Free Software Foundation
+ Copyright (C) 2006, 2008, 2009
, 2010
Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-621,7
+621,7
@@
psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column)
}
}
}
}
- fp = var_get_
write
_format (pv);
+ fp = var_get_
print
_format (pv);
text = data_out (&v, dict_get_encoding (dict), fp);
text = data_out (&v, dict_get_encoding (dict), fp);
@@
-679,7
+679,7
@@
psppire_data_store_set_string (PsppireDataStore *store,
psppire_data_store_data_in (store, row,
var_get_case_index (pv), ss_cstr (text),
psppire_data_store_data_in (store, row,
var_get_case_index (pv), ss_cstr (text),
- var_get_
write
_format (pv));
+ var_get_
print
_format (pv));
psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), row, col, row, col);
psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), row, col, row, col);
@@
-793,7
+793,7
@@
get_column_button_label (const PsppireSheetModel *model, gint col)
PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
if ( col >= psppire_dict_get_var_cnt (ds->dict) )
PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
if ( col >= psppire_dict_get_var_cnt (ds->dict) )
- return
g_locale_to_utf8 (null_var_name, -1, 0, 0, 0
);
+ return
xstrdup (gettext (null_var_name)
);
pv = psppire_dict_get_variable (ds->dict, col);
pv = psppire_dict_get_variable (ds->dict, col);
@@
-879,7
+879,7
@@
psppire_data_store_insert_case (PsppireDataStore *ds,
g_return_val_if_fail (ds, FALSE);
g_return_val_if_fail (ds->datasheet, FALSE);
g_return_val_if_fail (ds, FALSE);
g_return_val_if_fail (ds->datasheet, FALSE);
- case_ref (cc);
+ c
c = c
ase_ref (cc);
result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1);
if ( result )
result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1);
if ( result )
@@
-959,8
+959,8
@@
psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx,
FALSE);
value_init (&value, width);
ok = (datasheet_get_value (ds->datasheet, casenum, idx, &value)
FALSE);
value_init (&value, width);
ok = (datasheet_get_value (ds->datasheet, casenum, idx, &value)
- && data_in
(input, UTF8, fmt->type, 0, 0, 0
,
-
dict->dict, &value, width
)
+ && data_in
_msg (input, UTF8, fmt->type, &value, width
,
+
dict_get_encoding (dict->dict)
)
&& datasheet_put_value (ds->datasheet, casenum, idx, &value));
value_destroy (&value, width);
&& datasheet_put_value (ds->datasheet, casenum, idx, &value));
value_destroy (&value, width);