X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.h;h=76c3aa42e88a195f9528720e41d80c11cbf49c47;hb=766e653e08dc6bd4e4b9db9e8404ae5e2adff07f;hp=ecd5de063fbe4d37ec4b4dcc500c2793ce2e99d6;hpb=1641c5707278765ec595bda341378aa7c6bec152;p=pspp

diff --git a/src/ui/gui/psppire-dict.h b/src/ui/gui/psppire-dict.h
index ecd5de063f..76c3aa42e8 100644
--- a/src/ui/gui/psppire-dict.h
+++ b/src/ui/gui/psppire-dict.h
@@ -42,12 +42,26 @@ 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
 {
   GObject             parent;
-  struct dictionary *dict;
+  struct dictionary   *dict;
+
+  gboolean dispose_has_run;
 
   gboolean disable_insert_signal;
   /* For GtkTreeModelIface */
@@ -67,10 +81,10 @@ gboolean       psppire_dict_set_name (PsppireDict* s, gint idx, const gchar *nam
 void           psppire_dict_delete_var (PsppireDict *s, gint idx);
 
 /* Return the number of variables in the dictionary */
-gint psppire_dict_get_var_cnt (const PsppireDict *d);
+gint psppire_dict_get_n_vars (const PsppireDict *d);
 
 /* Return the number of `union value's in the dictionary */
-size_t psppire_dict_get_value_cnt (const PsppireDict *d);
+size_t psppire_dict_get_n_values (const PsppireDict *d);
 
 /* Returns the prototype for the cases that match the dictionary */
 const struct caseproto *psppire_dict_get_proto (const PsppireDict *d);
@@ -107,10 +121,6 @@ void psppire_dict_replace_dictionary (PsppireDict *, struct dictionary *);
 
 struct variable * psppire_dict_get_weight_variable (const PsppireDict *);
 
-#if DEBUGGING
-void psppire_dict_dump (const PsppireDict *);
-#endif
-
 const gchar *psppire_dict_encoding (const PsppireDict *);
 
 G_END_DECLS