projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Factor out duplicated code for executing and pasting syntax.
[pspp]
/
src
/
ui
/
gui
/
psppire.c
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index d75bff359b1d33aac4b0d8f177a259e47d014903..bb6006d111be872bb67aa29a9c0716bc4d2c6a50 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-16,8
+16,6
@@
#include <config.h>
#include <config.h>
-#include "ui/gui/psppire.h"
-
#include <assert.h>
#include <gsl/gsl_errno.h>
#include <gtk/gtk.h>
#include <assert.h>
#include <gsl/gsl_errno.h>
#include <gtk/gtk.h>
@@
-32,15
+30,19
@@
#include "data/procedure.h"
#include "data/settings.h"
#include "data/sys-file-reader.h"
#include "data/procedure.h"
#include "data/settings.h"
#include "data/sys-file-reader.h"
+
#include "language/lexer/lexer.h"
#include "language/syntax-string-source.h"
#include "language/lexer/lexer.h"
#include "language/syntax-string-source.h"
+
#include "libpspp/getl.h"
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/version.h"
#include "libpspp/getl.h"
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/version.h"
+
#include "output/driver.h"
#include "output/journal.h"
#include "output/message-item.h"
#include "output/driver.h"
#include "output/journal.h"
#include "output/message-item.h"
+
#include "ui/gui/dict-display.h"
#include "ui/gui/executor.h"
#include "ui/gui/psppire-data-store.h"
#include "ui/gui/dict-display.h"
#include "ui/gui/executor.h"
#include "ui/gui/psppire-data-store.h"
@@
-96,7
+98,7
@@
initialize (struct source_stream *ss, const char *data_file)
preregister_widgets ();
gsl_set_error_handler_off ();
preregister_widgets ();
gsl_set_error_handler_off ();
- settings_init (
&viewer_width, &viewer_length
);
+ settings_init ();
fh_init ();
the_dataset = create_dataset ();
fh_init ();
the_dataset = create_dataset ();
@@
-132,7
+134,7
@@
initialize (struct source_stream *ss, const char *data_file)
if (data_file != NULL)
load_data_file (data_file);
if (data_file != NULL)
load_data_file (data_file);
- execute_
syntax (create_syntax_string_source ("")
);
+ execute_
const_syntax_string (""
);
gtk_widget_show (the_data_window);
}
gtk_widget_show (the_data_window);
}
@@
-268,7
+270,7
@@
load_data_file (const char *arg)
utf8 = g_locale_to_utf8 (arg, -1, NULL, &written, &err);
if ( NULL == utf8)
{
utf8 = g_locale_to_utf8 (arg, -1, NULL, &written, &err);
if ( NULL == utf8)
{
- g_warning ("Cannot convert filename from local encoding
\"%s\"
to UTF-8: %s",
+ g_warning ("Cannot convert filename from local encoding
`%s'
to UTF-8: %s",
local_encoding,
err->message);
g_clear_error (&err);
local_encoding,
err->message);
g_clear_error (&err);