#include <config.h>
-#include "ui/gui/psppire.h"
-
#include <assert.h>
#include <gsl/gsl_errno.h>
#include <gtk/gtk.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 "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 "ui/gui/dict-display.h"
#include "ui/gui/executor.h"
-#include "ui/gui/message-dialog.h"
#include "ui/gui/psppire-data-store.h"
#include "ui/gui/psppire-data-window.h"
#include "ui/gui/psppire-dict.h"
#include "ui/source-init-opts.h"
#include "ui/syntax-gen.h"
+#include "gl/configmake.h"
#include "gl/xalloc.h"
#include "gl/relocatable.h"
static GtkWidget *the_data_window;
+static void handle_msg (const struct msg *);
static void load_data_file (const char *);
static void
preregister_widgets ();
gsl_set_error_handler_off ();
- settings_init (&viewer_width, &viewer_length);
+ settings_init ();
fh_init ();
the_dataset = create_dataset ();
- message_dialog_init (the_source_stream);
the_source_stream = ss;
+ msg_init (ss, handle_msg);
dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
de_initialize (void)
{
destroy_source_stream (the_source_stream);
- message_dialog_done ();
settings_done ();
output_close ();
i18n_done ();
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);
g_free (filename);
}
+
+static void
+handle_msg (const struct msg *m)
+{
+ message_item_submit (message_item_create (m));
+}