projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved the encapsulation of PsppireCaseFile
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire.c
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index d636ab4960781ddc911e0dc813917f9e85de58d4..06b1488762f9ba195e98210291b9041619996b51 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-68,10
+68,9
@@
replace_dictionary (struct dictionary *d)
static void
replace_casereader (struct casereader *s)
{
static void
replace_casereader (struct casereader *s)
{
-
struct datasheet *datasheet = datasheet_create
(s);
+
PsppireCaseFile *pcf = psppire_case_file_new
(s);
- psppire_case_file_replace_datasheet (the_data_store->case_file,
- datasheet);
+ psppire_data_store_set_case_file (the_data_store, pcf);
}
void
}
void
@@
-100,11
+99,12
@@
initialize (void)
the_dataset = create_dataset (replace_casereader,
replace_dictionary);
the_dataset = create_dataset (replace_casereader,
replace_dictionary);
+
+
message_dialog_init (the_source_stream);
message_dialog_init (the_source_stream);
- dictionary = psppire_dict_new_from_dict (
- dataset_dict (the_dataset)
- );
+ dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
+
bind_textdomain_codeset (PACKAGE, "UTF-8");
bind_textdomain_codeset (PACKAGE, "UTF-8");
@@
-113,10
+113,7
@@
initialize (void)
the_var_store = psppire_var_store_new (dictionary);
the_data_store = psppire_data_store_new (dictionary);
the_var_store = psppire_var_store_new (dictionary);
the_data_store = psppire_data_store_new (dictionary);
-
-
- proc_set_active_file_data (the_dataset,
- datasheet_make_reader (the_data_store->case_file->datasheet));
+ replace_casereader (NULL);
create_icon_factory ();
create_icon_factory ();