X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.c;h=fb89dfa20e928c68557a82186b63680e5601b84b;hb=deea66e1be0c3e783b159e1605a697d9e75861aa;hp=9b1b26a21748a41ad1b203d182dc370f96bf9327;hpb=a258e53c63a08b0ec48aea8f03808eb651729424;p=pspp

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index 9b1b26a217..fb89dfa20e 100644
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2006, 2008, 2009, 2010  Free Software Foundation
+   Copyright (C) 2006, 2008, 2009, 2010, 2012  Free Software Foundation
 
    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
@@ -239,7 +239,7 @@ psppire_data_store_get_case_count_wrapper (const PsppireSheetModel *model)
 static void
 psppire_data_store_init (PsppireDataStore *data_store)
 {
-  data_store->dict = 0;
+  data_store->dict = NULL;
   data_store->datasheet = NULL;
   data_store->dispose_has_run = FALSE;
 }
@@ -301,8 +301,8 @@ psppire_data_store_sheet_model_init (PsppireSheetModelIface *iface)
    A callback which occurs after a variable has been deleted.
  */
 static void
-delete_variable_callback (GObject *obj, gint dict_index,
-			  gint case_index, gint width,
+delete_variable_callback (GObject *obj, const struct variable *var UNUSED,
+                          gint dict_index, gint case_index,
 			  gpointer data)
 {
   PsppireDataStore *store  = PSPPIRE_DATA_STORE (data);
@@ -419,7 +419,7 @@ psppire_data_store_new (PsppireDict *dict)
 {
   PsppireDataStore *retval;
 
-  retval = g_object_new (GTK_TYPE_DATA_STORE, NULL);
+  retval = g_object_new (PSPPIRE_TYPE_DATA_STORE, NULL);
 
   psppire_data_store_set_dictionary (retval, dict);
 
@@ -621,7 +621,7 @@ psppire_data_store_get_string (PsppireDataStore *store, glong row, glong column)
         }
     }
 
-  fp = var_get_write_format (pv);
+  fp = var_get_print_format (pv);
 
   text = data_out (&v, dict_get_encoding (dict), fp);
 
@@ -679,7 +679,7 @@ psppire_data_store_set_string (PsppireDataStore *store,
 
   psppire_data_store_data_in (store, row,
 			      var_get_case_index (pv), ss_cstr (text),
-			      var_get_write_format (pv));
+			      var_get_print_format (pv));
 
   psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store), row, col, row, col);