Used type casenumber in GUI code where appropriate. Also, generally

[pspp-builds.git] / src / ui / gui / psppire-data-store.h

diff --git a/src/ui/gui/psppire-data-store.h b/src/ui/gui/psppire-data-store.h
index d9b058432bdcc9f4f4f284b28278401b2b761985..d305ad844516bec91e711bc470344766045fc6cf 100644 (file)
--- a/src/ui/gui/psppire-data-store.h
+++ b/src/ui/gui/psppire-data-store.h
@@ -1,12 +1,9 @@
-/* psppire-data-store.h
- 
-   PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.

    Copyright (C) 2006  Free Software Foundation
    Copyright (C) 2006  Free Software Foundation

-   Written by John Darrington

 
 

-   This program is free software; you can redistribute it and/or modify
+   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
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */

 
 #ifndef __PSPPIRE_DATA_STORE_H__
 #define __PSPPIRE_DATA_STORE_H__
 
 #ifndef __PSPPIRE_DATA_STORE_H__
 #define __PSPPIRE_DATA_STORE_H__


@@ -26,6 +21,9 @@
 #include "psppire-dict.h"
 #include "psppire-case-file.h"
 
 #include "psppire-dict.h"
 #include "psppire-case-file.h"
 

+#define FIRST_CASE_NUMBER 1
+
+

 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */


@@ -59,7 +57,11 @@ struct _PsppireDataStore
   /*< private >*/
   PsppireDict *dict;
   PsppireCaseFile *case_file;
   /*< private >*/
   PsppireDict *dict;
   PsppireCaseFile *case_file;

-  PangoFontDescription *font_desc;
+  const PangoFontDescription *font_desc;
+
+  /* The width of an upper case 'M' rendered in the current font */
+  gint width_of_m ;
+

   gboolean show_labels;
 
   /* Geometry */
   gboolean show_labels;
 
   /* Geometry */


@@ -81,21 +83,32 @@ struct _PsppireDataStoreClass
 inline GType psppire_data_store_get_type (void) G_GNUC_CONST;
 PsppireDataStore *psppire_data_store_new     (PsppireDict *dict);
 
 inline GType psppire_data_store_get_type (void) G_GNUC_CONST;
 PsppireDataStore *psppire_data_store_new     (PsppireDict *dict);
 

-void psppire_data_store_set_dictionary(PsppireDataStore *data_store, PsppireDict *dict);
-void psppire_data_store_set_font(PsppireDataStore *store, PangoFontDescription *fd);
+void psppire_data_store_set_case_file (PsppireDataStore *data_store,
+                                      PsppireCaseFile *cf);
+
+void psppire_data_store_set_dictionary (PsppireDataStore *data_store,
+                                       PsppireDict *dict);
+
+void psppire_data_store_set_font (PsppireDataStore *store,
+                                const PangoFontDescription *fd);

 
 

-void psppire_data_store_show_labels(PsppireDataStore *store, gboolean show_labels);
+void psppire_data_store_show_labels (PsppireDataStore *store,
+                                   gboolean show_labels);

 
 

-  
-void psppire_data_store_clear(PsppireDataStore *data_store);
+void psppire_data_store_clear (PsppireDataStore *data_store);

 
 

+gboolean psppire_data_store_insert_new_case (PsppireDataStore *ds, casenumber posn);

 
 

+struct casereader * psppire_data_store_get_reader (PsppireDataStore *ds);

 
 

+gchar * psppire_data_store_get_string (PsppireDataStore *ds,
+                                      casenumber row, glong column);

 
 

-struct file_handle;
+gboolean psppire_data_store_set_string (PsppireDataStore *ds,
+                                       const gchar *text,
+                                       glong row, glong column);

 
 

-void psppire_data_store_create_system_file(PsppireDataStore *store,
-                                  struct file_handle *handle);
+casenumber psppire_data_store_get_case_count (PsppireDataStore *store);

 
 
 #ifdef __cplusplus
 
 
 #ifdef __cplusplus