Merge 'master' into 'gtk3'.

[pspp] / src / ui / gui / spreadsheet-test.c

diff --git a/src/ui/gui/spreadsheet-test.c b/src/ui/gui/spreadsheet-test.c
index 90a10375ec460dbfd04a76c2a5a5091a508d341e..8c96ec96a886607beedc0a010be7837dc9e17ebb 100644 (file)
--- a/src/ui/gui/spreadsheet-test.c
+++ b/src/ui/gui/spreadsheet-test.c
@@ -28,7 +28,10 @@
 #include "data/spreadsheet-reader.h"
 #include "data/casereader.h"
 #include "data/case.h"
+#include "data/settings.h"
 #include "libpspp/message.h"
+#include "libpspp/i18n.h"
+
 #include "gl/xalloc.h"
 
 
@@ -52,7 +55,8 @@ on_clicked (GtkButton *button, struct xxx *stuff)
 
   opts.sheet_index = -1;
   opts.cell_range = spreadsheet_get_sheet_range (stuff->sp, x);
-  opts.sheet_name = spreadsheet_get_sheet_name (stuff->sp, x);
+  opts.sheet_name = CONST_CAST (char *,
+                                spreadsheet_get_sheet_name (stuff->sp, x));
   opts.read_names = TRUE;
   opts.asw = -1;
 
@@ -78,7 +82,7 @@ on_clicked (GtkButton *button, struct xxx *stuff)
        else
          {
            char *ss = xzalloc (width + 1);
-           strncpy (ss, value_str (val, width), width);
+            memcpy (ss, value_str (val, width), width);
            
            printf ("%s ", ss);
            free (ss);
@@ -109,6 +113,9 @@ main (int argc, char *argv[] )
   GtkWidget *button;
   struct xxx stuff;
 
+  i18n_init ();
+  settings_init ();
+
   gtk_init (&argc, &argv);
     
   if ( argc < 2)
@@ -132,8 +139,8 @@ main (int argc, char *argv[] )
 
   tm = psppire_spreadsheet_model_new (stuff.sp);
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  hbox = gtk_hbox_new (FALSE, 5);
-  vbox = gtk_vbox_new (FALSE, 5);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
 
   button = gtk_button_new_with_label ("Test reader");
   g_signal_connect (button, "clicked", G_CALLBACK (on_clicked), &stuff);