projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use non-deprecated functions.
[pspp-builds.git]
/
src
/
ui
/
gui
/
helper.c
diff --git
a/src/ui/gui/helper.c
b/src/ui/gui/helper.c
index 09711f1bd1a39f4d51aa3f764fbba901ec862a58..274635d7913b1412ce206416af7d393d64c1a4bb 100644
(file)
--- a/
src/ui/gui/helper.c
+++ b/
src/ui/gui/helper.c
@@
-40,6
+40,7
@@
#include <data/procedure.h>
#include <language/lexer/lexer.h>
#include "psppire-data-store.h"
#include <data/procedure.h>
#include <language/lexer/lexer.h>
#include "psppire-data-store.h"
+#include <output/manager.h>
#include <gettext.h>
#include <gettext.h>
@@
-164,17
+165,16
@@
extern struct dataset *the_dataset;
extern struct source_stream *the_source_stream;
extern PsppireDataStore *the_data_store;
extern struct source_stream *the_source_stream;
extern PsppireDataStore *the_data_store;
-gboolean
+void
execute_syntax (struct getl_interface *sss)
{
execute_syntax (struct getl_interface *sss)
{
- gboolean status;
struct lexer *lexer;
struct casereader *reader = psppire_data_store_get_reader (the_data_store);
proc_set_active_file_data (the_dataset, reader);
struct lexer *lexer;
struct casereader *reader = psppire_data_store_get_reader (the_data_store);
proc_set_active_file_data (the_dataset, reader);
- g_return_
val_if_fail (proc_has_active_file (the_dataset), FALSE
);
+ g_return_
if_fail (proc_has_active_file (the_dataset)
);
lexer = lex_create (the_source_stream);
lexer = lex_create (the_source_stream);
@@
-192,11
+192,6
@@
execute_syntax (struct getl_interface *sss)
lex_destroy (lexer);
lex_destroy (lexer);
- /* GUI syntax needs this implicit EXECUTE command at the end of
- every script. Otherwise commands like GET could leave the GUI
- without a datasheet. */
- status = proc_execute (the_dataset);
-
psppire_dict_replace_dictionary (the_data_store->dict,
dataset_dict (the_dataset));
psppire_dict_replace_dictionary (the_data_store->dict,
dataset_dict (the_dataset));
@@
-206,7
+201,7
@@
execute_syntax (struct getl_interface *sss)
psppire_data_store_set_case_file (the_data_store, pcf);
}
psppire_data_store_set_case_file (the_data_store, pcf);
}
-
return status
;
+
som_flush ()
;
}
}