Merge remote-tracking branch 'origin/sheet'

[pspp] / src / ui / gui / psppire-dict.h

diff --git a/src/ui/gui/psppire-dict.h b/src/ui/gui/psppire-dict.h
index 4deabcaf8f07a05408819d65901364f4c2bf2ceb..4d78807cba2d97464d9b9a052b8df5904207587d 100644 (file)
--- a/src/ui/gui/psppire-dict.h
+++ b/src/ui/gui/psppire-dict.h
@@ -42,7 +42,19 @@ G_BEGIN_DECLS
 typedef struct _PsppireDict       PsppireDict;
 typedef struct _PsppireDictClass PsppireDictClass;
 
-enum {DICT_TVM_COL_NAME=0, DICT_TVM_COL_VAR, DICT_TVM_COL_LABEL, n_DICT_COLS} ;
+enum {DICT_TVM_COL_NAME=0,
+      DICT_TVM_COL_TYPE,
+      DICT_TVM_COL_WIDTH,
+      DICT_TVM_COL_DECIMAL,
+      DICT_TVM_COL_LABEL,
+      DICT_TVM_COL_VALUE_LABELS,
+      DICT_TVM_COL_MISSING_VALUES,
+      DICT_TVM_COL_COLUMNS,
+      DICT_TVM_COL_ALIGNMENT,
+      DICT_TVM_COL_MEASURE,
+      DICT_TVM_COL_ROLE,
+      DICT_TVM_COL_VAR,
+      n_DICT_COLS} ;
 
 struct _PsppireDict
 {
@@ -93,10 +105,6 @@ void psppire_dict_delete_variables (PsppireDict *d, gint first, gint n);
 struct variable *psppire_dict_insert_variable (PsppireDict *d, gint idx,
                                                const gchar *name);
 
-void psppire_dict_resize_variable (PsppireDict *,
-                                 const struct variable *,
-                                 gint, gint );
-
 gboolean psppire_dict_check_name (const PsppireDict *dict,
                              const gchar *name, gboolean report);