X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-store.h;h=efeb886864e4ab1c2105bf563b407c56c0e2a017;hb=4eb2e820b01d92ef662c741f5ac30f08bedd1de6;hp=6e2ec906fc49289eb0dd8865af87b7f00826d59a;hpb=674fde3ca5d316e3633de4dd64f897af27674243;p=pspp

diff --git a/src/ui/gui/psppire-data-store.h b/src/ui/gui/psppire-data-store.h
index 6e2ec906fc..efeb886864 100644
--- a/src/ui/gui/psppire-data-store.h
+++ b/src/ui/gui/psppire-data-store.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2006, 2009  Free Software Foundation
+   Copyright (C) 2006, 2009, 2011, 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
@@ -17,6 +17,7 @@
 #ifndef __PSPPIRE_DATA_STORE_H__
 #define __PSPPIRE_DATA_STORE_H__
 
+#include <gtk/gtk.h>
 #include "psppire-dict.h"
 
 #define FIRST_CASE_NUMBER 1
@@ -57,7 +58,6 @@ enum dict_signal_handler {
   VARIABLE_INSERTED,
   VARIABLE_CHANGED,
   VARIABLE_DELETED,
-  SIZE_CHANGED,
   n_dict_signals
 };
 
@@ -73,10 +73,8 @@ struct _PsppireDataStore
   gboolean dispose_has_run ;
   PsppireDict *dict;
   struct datasheet *datasheet;
+  gint stamp;
 
-  gboolean show_labels;
-
-  //  gint cf_handler_id [n_cf_signals];
   gint dict_handler_id [n_dict_signals];
 };
 
@@ -96,25 +94,48 @@ void psppire_data_store_set_reader (PsppireDataStore *ds,
 void psppire_data_store_set_dictionary (PsppireDataStore *data_store,
 					PsppireDict *dict);
 
-void psppire_data_store_show_labels (PsppireDataStore *store,
-				     gboolean show_labels);
-
 void psppire_data_store_clear (PsppireDataStore *data_store);
 
 gboolean psppire_data_store_insert_new_case (PsppireDataStore *ds, casenumber posn);
 
+gboolean psppire_data_store_insert_value (PsppireDataStore *ds,
+					  gint width, gint where);
 
 gboolean psppire_data_store_delete_cases (PsppireDataStore *ds, casenumber first, casenumber count);
 
 
 struct casereader * psppire_data_store_get_reader (PsppireDataStore *ds);
 
-gchar * psppire_data_store_get_string (PsppireDataStore *ds,
-				       casenumber row, glong column);
+gchar *psppire_data_store_get_string (PsppireDataStore *,
+                                      glong row, const struct variable *,
+                                      bool use_value_label);
+
+gchar * psppire_data_store_value_to_string (gpointer unused, PsppireDataStore *store,
+					    gint col, gint row,
+					    const GValue *v);
+
+gchar * psppire_data_store_value_to_string_with_labels (gpointer unused,
+							PsppireDataStore *store,
+							gint col, gint row,
+							const GValue *v);
+
+gboolean psppire_data_store_string_to_value (GtkTreeModel *model, gint col, gint row,
+					     const gchar *in, GValue *out);
+
+gboolean psppire_data_store_get_value (PsppireDataStore *store,
+				       glong row, const struct variable *var,
+				       union value *val);
+
+gboolean psppire_data_store_set_value (PsppireDataStore *,
+                                       casenumber casenum,
+                                       const struct variable *,
+                                       const union value *);
+
 
 gboolean psppire_data_store_set_string (PsppireDataStore *ds,
 					const gchar *text,
-					glong row, glong column);
+					glong row, const struct variable *,
+                                        gboolean use_value_label);
 
 
 gboolean psppire_data_store_filtered (PsppireDataStore *ds,