Fixed the two biggest sources of GtkCritical errors.

[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 c16d158e23803e3b5ed21ca7b57ab9b4b17b31b0..ed4f0fd17c65f9f7ca4ea8942d0c47b7a34b7252 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,24 +21,33 @@
 #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 */
 
 #define GTK_TYPE_DATA_STORE           (psppire_data_store_get_type ())
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 #define GTK_TYPE_DATA_STORE           (psppire_data_store_get_type ())
 

-#define PSPPIRE_DATA_STORE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+#define PSPPIRE_DATA_STORE(obj)        \
+                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), \

                                                                    GTK_TYPE_DATA_STORE, PsppireDataStore))
 
                                                                    GTK_TYPE_DATA_STORE, PsppireDataStore))
 

-#define PSPPIRE_DATA_STORE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), \
+#define PSPPIRE_DATA_STORE_CLASS(klass) \
+                     (G_TYPE_CHECK_CLASS_CAST ((klass), \

                                                                 GTK_TYPE_DATA_STORE, \
                                                                  PsppireDataStoreClass))
 
                                                                 GTK_TYPE_DATA_STORE, \
                                                                  PsppireDataStoreClass))
 

-#define PSPPIRE_IS_DATA_STORE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_DATA_STORE))

 
 

-#define PSPPIRE_IS_DATA_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DATA_STORE))
+#define PSPPIRE_IS_DATA_STORE(obj) \
+                    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_DATA_STORE))
+
+#define PSPPIRE_IS_DATA_STORE_CLASS(klass) \
+                     (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DATA_STORE))

 
 

-#define PSPPIRE_DATA_STORE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+#define PSPPIRE_DATA_STORE_GET_CLASS(obj) \
+                     (G_TYPE_INSTANCE_GET_CLASS ((obj), \

                                                                   GTK_TYPE_DATA_STORE, \
                                                                   PsppireDataStoreClass))
 
                                                                   GTK_TYPE_DATA_STORE, \
                                                                   PsppireDataStoreClass))
 


@@ -52,6 +56,26 @@ typedef struct _PsppireDataStoreClass  PsppireDataStoreClass;
 
 struct dictionary;
 
 
 struct dictionary;
 

+
+enum cf_signal_handler {
+  CASES_DELETED,
+  CASE_INSERTED,
+  CASE_CHANGED,
+  n_cf_signals
+};
+
+
+enum dict_signal_handler {
+  VARIABLE_INSERTED,
+  VARIABLE_CHANGED,
+  VARIABLE_DELETED,
+  SIZE_CHANGED,
+  n_dict_signals
+};
+
+void do_this_thing (PsppireDict *, struct dictionary *, void *);
+
+

 struct _PsppireDataStore
 {
   GObject parent;
 struct _PsppireDataStore
 {
   GObject parent;


@@ -62,12 +86,15 @@ struct _PsppireDataStore
   const PangoFontDescription *font_desc;
 
   /* The width of an upper case 'M' rendered in the current font */
   const PangoFontDescription *font_desc;
 
   /* The width of an upper case 'M' rendered in the current font */

-  gint width_of_m ; 
-  
+  gint width_of_m ;
+

   gboolean show_labels;
 
   /* Geometry */
   gint margin_width;
   gboolean show_labels;
 
   /* Geometry */
   gint margin_width;

+
+  gint cf_handler_id [n_cf_signals];
+  gint dict_handler_id [n_dict_signals];

 };
 
 struct _PsppireDataStoreClass
 };
 
 struct _PsppireDataStoreClass


@@ -85,22 +112,36 @@ 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_case_file (PsppireDataStore *data_store,
+                                      PsppireCaseFile *cf);

 
 

-void psppire_data_store_set_font(PsppireDataStore *store, 
+void psppire_data_store_set_dictionary (PsppireDataStore *data_store,
+                                       PsppireDict *dict);
+
+void psppire_data_store_set_font (PsppireDataStore *store,

                                 const PangoFontDescription *fd);
 
                                 const PangoFontDescription *fd);
 

-void psppire_data_store_show_labels(PsppireDataStore *store, 
+void psppire_data_store_show_labels (PsppireDataStore *store,

                                    gboolean show_labels);
                                    gboolean show_labels);

-  
-void psppire_data_store_clear(PsppireDataStore *data_store);

 
 

-struct file_handle;
+void psppire_data_store_clear (PsppireDataStore *data_store);
+
+gboolean psppire_data_store_insert_new_case (PsppireDataStore *ds, casenumber posn);
+
+
+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);

 
 

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

 
 

+casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds);

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }