X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.h;h=a4782efceb04e009126e7408eb10289ed1f85438;hb=8ea97bfb8e21cac5964212c175782c48159764b7;hp=913c4076c05fa7a739fbf8824b1984dc168c7bb2;hpb=108b065bd799f003c05bc3cbf2334078b43540f3;p=pspp
diff --git a/src/ui/gui/psppire-var-store.h b/src/ui/gui/psppire-var-store.h
index 913c4076c0..a4782efceb 100644
--- a/src/ui/gui/psppire-var-store.h
+++ b/src/ui/gui/psppire-var-store.h
@@ -1,11 +1,9 @@
-/* psppire-var-store.h
-
- PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
Copyright (C) 2006 Free Software Foundation
- 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
- 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,
@@ -14,9 +12,7 @@
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 . */
#ifndef __PSPPIRE_VAR_STORE_H__
#define __PSPPIRE_VAR_STORE_H__
@@ -25,10 +21,24 @@
#include "psppire-dict.h"
#include
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
+
+/* PSPPIRE variable store format type, to determine whether a
+ PSPPIRE variable store contains variable input formats or
+ variable output formats. */
+GType psppire_var_store_format_type_get_type (void);
+
+typedef enum
+ {
+ PSPPIRE_VAR_STORE_INPUT_FORMATS,
+ PSPPIRE_VAR_STORE_OUTPUT_FORMATS
+ }
+PsppireVarStoreFormatType;
+#define G_TYPE_PSPPIRE_VAR_STORE_FORMAT_TYPE \
+ (psppire_var_store_format_type_get_type ())
+
+/* PSPPIRE variable store. */
#define GTK_TYPE_VAR_STORE (psppire_var_store_get_type ())
#define PSPPIRE_VAR_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
@@ -57,6 +67,8 @@ struct _PsppireVarStore
PsppireDict *dict;
GdkColor disabled;
const PangoFontDescription *font_desc;
+ gint trailing_rows;
+ PsppireVarStoreFormatType format_type;
};
struct _PsppireVarStoreClass
@@ -73,7 +85,7 @@ struct _PsppireVarStoreClass
GType psppire_var_store_get_type (void) G_GNUC_CONST;
PsppireVarStore *psppire_var_store_new (PsppireDict *dict);
-struct variable * psppire_var_store_get_var (PsppireVarStore *store, gint row);
+struct variable * psppire_var_store_get_var (PsppireVarStore *store, glong row);
void psppire_var_store_set_dictionary (PsppireVarStore *var_store, PsppireDict *dict);
@@ -84,9 +96,21 @@ gint psppire_var_store_get_var_cnt (PsppireVarStore *var_store);
void psppire_var_store_set_font (PsppireVarStore *store, const PangoFontDescription *fd);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
+enum {
+ PSPPIRE_VAR_STORE_COL_NAME,
+ PSPPIRE_VAR_STORE_COL_TYPE,
+ PSPPIRE_VAR_STORE_COL_WIDTH,
+ PSPPIRE_VAR_STORE_COL_DECIMALS,
+ PSPPIRE_VAR_STORE_COL_LABEL,
+ PSPPIRE_VAR_STORE_COL_VALUES,
+ PSPPIRE_VAR_STORE_COL_MISSING,
+ PSPPIRE_VAR_STORE_COL_COLUMNS,
+ PSPPIRE_VAR_STORE_COL_ALIGN,
+ PSPPIRE_VAR_STORE_COL_MEASURE,
+ PSPPIRE_VAR_STORE_n_COLS
+};
#endif /* __PSPPIRE_VAR_STORE_H__ */