Converted strings to utf8 before passing to gtksheet. Should work properly now with

[pspp-builds.git] / src / ui / gui / psppire.c

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index d18788150fbb97eb5f66edac01ffebe1efade87d..9d01f9f76a4f8bbe9b4edfce3e81c51278b0715a 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -39,6 +39,7 @@
 #include "data-sheet.h"
 #include "var-sheet.h"
 #include "psppire-case-array.h"
+#include "message-dialog.h"
 
 GladeXML *xml;
 
@@ -56,20 +57,28 @@ static bool parse_command_line (int *argc, char ***argv);
 int 
 main(int argc, char *argv[]) 
 {
+  PsppireVarStore *var_store ;
+  GtkWidget *data_editor ;
+  GtkSheet *var_sheet ; 
+  GtkSheet *data_sheet ;
+
+  gtk_init(&argc, &argv);
+
   if ( ! parse_command_line(&argc, &argv) ) 
     return 0;
 
-  gtk_init(&argc, &argv);
 
   glade_init();
 
+  message_dialog_init();
+
   the_dictionary = psppire_dict_new();
 
   /* Create the model for the var_sheet */
-  PsppireVarStore *var_store = psppire_var_store_new(the_dictionary);
+  var_store = psppire_var_store_new(the_dictionary);
 
   /* Create the model for the data sheet */
-  the_cases = psppire_case_array_new(100, 20);
+  the_cases = psppire_case_array_new(100000, 20);
 
   data_store = psppire_data_store_new(the_dictionary, the_cases);
 
@@ -78,15 +87,15 @@ main(int argc, char *argv[])
 
   if ( !xml ) return 1;
 
-  GtkWidget *data_editor = get_widget_assert(xml, "data_editor");
+  data_editor = get_widget_assert(xml, "data_editor");
   gtk_window_set_icon_from_file(GTK_WINDOW(data_editor), 
                                PKGDATADIR "/psppicon.png",0);
 
   /* connect the signals in the interface */
   glade_xml_signal_autoconnect(xml);
 
-  GtkSheet *var_sheet  = GTK_SHEET(get_widget_assert(xml, "variable_sheet"));
-  GtkSheet *data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
+  var_sheet  = GTK_SHEET(get_widget_assert(xml, "variable_sheet"));
+  data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
 
   gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store));
   
@@ -97,6 +106,9 @@ main(int argc, char *argv[])
 
   /* start the event loop */
   gtk_main();
+
+  message_dialog_done();
+
   return 0;
 }
 
@@ -133,7 +145,7 @@ parse_command_line (int *argc, char ***argv)
          g_print(legal);
          return false;
        default:
-         assert (0);
+         return false;
        }
     }