X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fspreadsheet-test.c;h=995872f4370fab582744610bb47034b50401897a;hb=55d9bfc27982744208fbe84cfb716da89cdbe4a2;hp=af0d18c81c8f6e4b082ff5092aa684198b529ceb;hpb=14f4522a17db23e67a6fa17876633cc6260cb42b;p=pspp

diff --git a/src/ui/gui/spreadsheet-test.c b/src/ui/gui/spreadsheet-test.c
index af0d18c81c..995872f437 100644
--- a/src/ui/gui/spreadsheet-test.c
+++ b/src/ui/gui/spreadsheet-test.c
@@ -69,7 +69,7 @@ on_clicked (GtkButton *button, struct xxx *stuff)
   proto = casereader_get_proto (reader);
 
   nvals = caseproto_get_n_widths (proto);
-  
+
   for (; (c = casereader_read (reader)) != NULL; case_unref (c))
     {
       int i;
@@ -83,8 +83,8 @@ on_clicked (GtkButton *button, struct xxx *stuff)
 	else
 	  {
 	    char *ss = xzalloc (width + 1);
-            memcpy (ss, value_str (val, width), width);
-	    
+            memcpy (ss, val->s, width);
+
 	    printf ("%s ", ss);
 	    free (ss);
 	  }
@@ -95,7 +95,7 @@ on_clicked (GtkButton *button, struct xxx *stuff)
   casereader_destroy (reader);
 }
 
-static void 
+static void
 print_msg (const struct msg *m, void *aux UNUSED)
 {
   fprintf (stderr, "%s\n", m->text);
@@ -103,7 +103,7 @@ print_msg (const struct msg *m, void *aux UNUSED)
 
 
 int
-main (int argc, char *argv[] )
+main (int argc, char *argv[])
 {
   GtkWidget *window;
   GtkWidget *hbox;
@@ -118,8 +118,8 @@ main (int argc, char *argv[] )
   settings_init ();
 
   gtk_init (&argc, &argv);
-    
-  if ( argc < 2)
+
+  if (argc < 2)
     g_error ("Usage: prog file\n");
 
   msg_set_handler (print_msg, 0);
@@ -131,7 +131,7 @@ main (int argc, char *argv[] )
 
   if (stuff.sp == NULL)
     stuff.sp = ods_probe (argv[1], false);
-  
+
   if (stuff.sp == NULL)
     {
       g_error ("%s is neither a gnumeric nor a ods file\n", argv[1]);
@@ -140,14 +140,14 @@ 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);
-   
+
   gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-  
+
   stuff.combo_box = gtk_combo_box_new();
 
   {
@@ -192,7 +192,7 @@ main (int argc, char *argv[] )
 
   gtk_main ();
 
-  spreadsheet_destroy (stuff.sp);
+  spreadsheet_unref (stuff.sp);
 
   return 0;
 }