Fixed bug which crashed gui if it attempted to enter invalid variable names.

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

diff --git a/src/ui/gui/psppire-dict.h b/src/ui/gui/psppire-dict.h
index 60d52cde9d3831c9cf2b8aa7437c1343da61ff1f..8756dbd8b933ab64d6c9d8d9ed27896c23f8498d 100644 (file)
--- a/src/ui/gui/psppire-dict.h
+++ b/src/ui/gui/psppire-dict.h
@@ -36,8 +36,8 @@ G_BEGIN_DECLS
 #define G_TYPE_PSPPIRE_DICT              (psppire_dict_get_type ())
 #define PSPPIRE_DICT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_PSPPIRE_DICT, PsppireDict))
 #define PSPPIRE_DICT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_PSPPIRE_DICT, PsppireDictClass))
-#define G_IS_PSPPIRE_DICT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_PSPPIRE_DICT))
-#define G_IS_PSPPIRE_DICT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_PSPPIRE_DICT))
+#define PSPPIRE_IS_DICT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_PSPPIRE_DICT))
+#define PSPPIRE_IS_DICT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_PSPPIRE_DICT))
 #define PSPPIRE_DICT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_PSPPIRE_DICT, PsppireDictClass))
 
 
@@ -66,8 +66,8 @@ struct _PsppireDictClass
 
 /* -- PsppireDict --- */
 GType          psppire_dict_get_type (void);
-PsppireDict*     psppire_dict_new_from_dict (struct dictionary *d);
-void           psppire_dict_set_name (PsppireDict* s, gint idx, const gchar *name);
+PsppireDict*   psppire_dict_new_from_dict (struct dictionary *d);
+gboolean       psppire_dict_set_name (PsppireDict* s, gint idx, const gchar *name);
 void           psppire_dict_delete_var (PsppireDict *s, gint idx);
 
 /* Return the number of variables in the dictionary */
@@ -78,16 +78,11 @@ gint psppire_dict_get_var_cnt (const PsppireDict *d);
 */
 struct variable * psppire_dict_lookup_var (const PsppireDict *d, const gchar *name);
 
-/* Tell the dictionary that one of its variable has changed */
-void psppire_dict_var_changed (PsppireDict *d, gint idx);
-
-
 /* Clears the contents of D */
 void psppire_dict_clear (PsppireDict *d);
 
 /* Return the IDXth variable */
-
-struct variable * psppire_dict_get_variable (PsppireDict *d, gint idx);
+struct variable * psppire_dict_get_variable (const PsppireDict *d, gint idx);
 
 /* Delete N variables beginning at FIRST */
 void psppire_dict_delete_variables (PsppireDict *d, gint first, gint n);
@@ -104,9 +99,13 @@ gboolean psppire_dict_check_name (const PsppireDict *dict,
 
 gint psppire_dict_get_next_value_idx (const PsppireDict *dict);
 
-void psppire_dict_rename_var (PsppireDict *dict, struct variable *v,
+gboolean psppire_dict_rename_var (PsppireDict *dict, struct variable *v,
                              const gchar *text);
 
+void psppire_dict_replace_dictionary (PsppireDict *, struct dictionary *);
+
+struct variable * psppire_dict_get_weight_variable (const PsppireDict *);
+
 
 G_END_DECLS