psppire-data-store: Use PSPPIRE namespace instead of GTK+'s.

[pspp] / src / ui / gui / psppire-data-store.c

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index 9833fb496f8a0be6dd3145fc7bbb334fe46b341f..f994474b5b81ac0a9ec5de06be3795933d6f7d99 100644 (file)
--- 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  Free Software Foundation
+   Copyright (C) 2006, 2008, 2009, 2010  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
@@ -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);
 
@@ -793,7 +793,7 @@ get_column_button_label (const PsppireSheetModel *model, gint col)
   PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
 
   if ( col >= psppire_dict_get_var_cnt (ds->dict) )
-    return g_locale_to_utf8 (null_var_name, -1, 0, 0, 0);
+    return xstrdup (gettext (null_var_name));
 
   pv = psppire_dict_get_variable (ds->dict, col);
 
@@ -879,7 +879,7 @@ psppire_data_store_insert_case (PsppireDataStore *ds,
   g_return_val_if_fail (ds, FALSE);
   g_return_val_if_fail (ds->datasheet, FALSE);
 
-  case_ref (cc);
+  cc = case_ref (cc);
   result = datasheet_insert_rows (ds->datasheet, posn, &cc, 1);
 
   if ( result )
@@ -959,8 +959,8 @@ psppire_data_store_data_in (PsppireDataStore *ds, casenumber casenum, gint idx,
                         FALSE);
   value_init (&value, width);
   ok = (datasheet_get_value (ds->datasheet, casenum, idx, &value)
-        && data_in (input, UTF8, fmt->type, 0, 0, 0,
-                   dict->dict, &value, width)
+        && data_in_msg (input, UTF8, fmt->type, &value, width,
+                        dict_get_encoding (dict->dict))
         && datasheet_put_value (ds->datasheet, casenum, idx, &value));
   value_destroy (&value, width);