X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=3614224510472520d8a315ea3a9db17c9e718904;hb=a8a5c3b5634a6255d1e0a057fc47c5a931b8492a;hp=162f5bbcf7a045fa2cf2cd880b6ae397a13133b7;hpb=877f476198562db5a61f3055ad0c68e39f384174;p=pspp-builds.git

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 162f5bbc..36142245 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,7 +1,6 @@
 /* 
    PSPPIRE --- A Graphical User Interface for PSPP
    Copyright (C) 2004, 2005, 2006  Free Software Foundation
-   Written by John Darrington
 
    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
@@ -18,12 +17,20 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA. */
 
+#include <config.h>
+
 #include <assert.h>
 #include <libintl.h>
 
 #include <libpspp/version.h>
 #include <libpspp/copyleft.h>
+#include <data/file-handle-def.h>
+#include <data/format.h>
 #include <data/settings.h>
+#include <data/file-name.h>
+#include <data/procedure.h>
+#include <libpspp/getl.h>
+#include <language/lexer/lexer.h>
 
 #include <getopt.h>
 #include <gtk/gtk.h>
@@ -73,6 +80,11 @@ PsppireVarStore *var_store = 0;
 
 void create_icon_factory (void);
 
+struct source_stream *the_source_stream ;
+struct lexer *the_lexer;
+struct dataset * the_dataset = NULL;
+
+
 int 
 main(int argc, char *argv[]) 
 {
@@ -110,16 +122,23 @@ main(int argc, char *argv[])
 
   glade_init();
 
-
+  fmt_init();
   settings_init();
+  fh_init ();
+  the_source_stream = create_source_stream (
+			  fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
+			  );
 
-  /* 
-  set_pspp_locale("da_DK");
-  */
+  the_lexer = lex_create (the_source_stream);
 
-  message_dialog_init();
+  the_dataset = create_dataset ();
 
-  the_dictionary = psppire_dict_new();
+  message_dialog_init (the_source_stream);
+
+  the_dictionary =
+    psppire_dict_new_from_dict (
+				dataset_dict (the_dataset)
+				);
 
   bind_textdomain_codeset(PACKAGE, "UTF-8");
 
@@ -136,7 +155,7 @@ main(int argc, char *argv[])
   if ( !xml ) return 1;
 
   data_editor = get_widget_assert(xml, "data_editor");
-  gtk_window_set_icon_from_file(GTK_WINDOW(data_editor), 
+  gtk_window_set_icon_from_file(GTK_WINDOW(data_editor),
 				PKGDATADIR "/psppicon.png",0);
 
   /* connect the signals in the interface */
@@ -146,7 +165,7 @@ main(int argc, char *argv[])
   data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
 
   gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store));
-  
+
   gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store));
 
   if (filename)
@@ -168,6 +187,7 @@ main(int argc, char *argv[])
   /* start the event loop */
   gtk_main();
 
+  destroy_source_stream (the_source_stream);
   message_dialog_done();
 
   settings_done();