X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.h;h=e4c2ecd827c47fd9bc6747fddcb1d710357e157b;hb=34bfbdd99ac80a84447cb8bbc46de726d0bdc7fc;hp=7ef186a0a1b06067f22dbb6899866558a91ee97a;hpb=7705ee1088e83c4d3d1bbb05039f2abb9af803b6;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-var-store.h b/src/ui/gui/psppire-var-store.h
index 7ef186a0..e4c2ecd8 100644
--- a/src/ui/gui/psppire-var-store.h
+++ b/src/ui/gui/psppire-var-store.h
@@ -34,7 +34,7 @@ typedef enum
   }
 PsppireVarStoreFormatType;
 
-#define G_TYPE_PSPPIRE_VAR_STORE_FORMAT_TYPE \
+#define PSPPIRE_TYPE_VAR_STORE_FORMAT_TYPE \
         (psppire_var_store_format_type_get_type ())
 
 /* PSPPIRE variable store. */
@@ -63,9 +63,8 @@ struct _PsppireVarStore
   GObject parent;
 
   /*< private >*/
-  PsppireDict *dict;
+  PsppireDict *dictionary;
   GdkColor disabled;
-  const PangoFontDescription *font_desc;
   PsppireVarStoreFormatType format_type;
 };
 
@@ -85,9 +84,6 @@ 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, glong row);
 
-void psppire_var_store_set_dictionary (PsppireVarStore *var_store, PsppireDict *dict);
-
-
 /* Return the number of variables */
 gint psppire_var_store_get_var_cnt (PsppireVarStore      *var_store);