projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deleted psppire-case-file.[ch]
[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 8e29db33ab9033311b6b662b71c301bb51315ead..0e9886337c51c00e1a0200f3dbe68239428d8053 100644
(file)
--- a/
src/ui/gui/psppire-data-store.h
+++ b/
src/ui/gui/psppire-data-store.h
@@
-17,16
+17,12
@@
#ifndef __PSPPIRE_DATA_STORE_H__
#define __PSPPIRE_DATA_STORE_H__
#ifndef __PSPPIRE_DATA_STORE_H__
#define __PSPPIRE_DATA_STORE_H__
-#include <gtksheet/gsheetmodel.h>
#include "psppire-dict.h"
#include "psppire-dict.h"
-#include "psppire-case-file.h"
#define FIRST_CASE_NUMBER 1
#define FIRST_CASE_NUMBER 1
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define GTK_TYPE_DATA_STORE (psppire_data_store_get_type ())
#define GTK_TYPE_DATA_STORE (psppire_data_store_get_type ())
@@
-56,50
+52,60
@@
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
+};
+
+
+struct datasheet;
+struct casereader;
+
struct _PsppireDataStore
{
GObject parent;
/*< private >*/
struct _PsppireDataStore
{
GObject parent;
/*< private >*/
+ gboolean dispose_has_run ;
PsppireDict *dict;
PsppireDict *dict;
- PsppireCaseFile *case_file;
- const PangoFontDescription *font_desc;
-
- /* The width of an upper case 'M' rendered in the current font */
- gint width_of_m ;
+ struct datasheet *datasheet;
gboolean show_labels;
gboolean show_labels;
- /* Geometry */
- gint
margin_width
;
+ gint cf_handler_id [n_cf_signals];
+ gint
dict_handler_id [n_dict_signals]
;
};
struct _PsppireDataStoreClass
{
GObjectClass parent_class;
};
struct _PsppireDataStoreClass
{
GObjectClass parent_class;
-
- /* Padding for future expansion */
- void (*_gtk_reserved1) (void);
- void (*_gtk_reserved2) (void);
- void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
};
};
-
inline
GType psppire_data_store_get_type (void) G_GNUC_CONST;
+GType psppire_data_store_get_type (void) G_GNUC_CONST;
PsppireDataStore *psppire_data_store_new (PsppireDict *dict);
PsppireDataStore *psppire_data_store_new (PsppireDict *dict);
-void psppire_data_store_set_case_file (PsppireDataStore *data_store,
- PsppireCaseFile *cf);
+
+void psppire_data_store_set_reader (PsppireDataStore *ds,
+ struct casereader *reader);
void psppire_data_store_set_dictionary (PsppireDataStore *data_store,
PsppireDict *dict);
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,
void psppire_data_store_show_labels (PsppireDataStore *store,
- gboolean show_labels);
+
gboolean show_labels);
void psppire_data_store_clear (PsppireDataStore *data_store);
void psppire_data_store_clear (PsppireDataStore *data_store);
@@
-119,10
+125,18
@@
gboolean psppire_data_store_set_string (PsppireDataStore *ds,
glong row, glong column);
casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds);
glong row, glong column);
casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds);
+size_t psppire_data_store_get_value_count (const PsppireDataStore *ds);
+
+
+
\f
+
+gboolean psppire_data_store_get_case (const PsppireDataStore *ds,
+ casenumber casenum,
+ struct ccase *c);
+
+
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __PSPPIRE_DATA_STORE_H__ */
#endif /* __PSPPIRE_DATA_STORE_H__ */