Re-added Data->Insert_Variable menu item

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

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 81bffe5cc9fa73623fbf491fb10663a82d51c3d8..9637e3cf9cb2b420fca9de381556b62f3849fe9e 100644 (file)
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -110,7 +110,7 @@ psppire_dict_class_init (PsppireDictClass *class)
 
   signal[VARIABLE_CHANGED] =
     g_signal_new ("variable_changed",
-                 G_TYPE_FROM_CLASS(class),
+                 G_TYPE_FROM_CLASS (class),
                  G_SIGNAL_RUN_FIRST,
                  0,
                  NULL, NULL,
@@ -123,7 +123,7 @@ psppire_dict_class_init (PsppireDictClass *class)
 
   signal[VARIABLE_INSERTED] =
     g_signal_new ("variable_inserted",
-                 G_TYPE_FROM_CLASS(class),
+                 G_TYPE_FROM_CLASS (class),
                  G_SIGNAL_RUN_FIRST,
                  0,
                  NULL, NULL,
@@ -135,7 +135,7 @@ psppire_dict_class_init (PsppireDictClass *class)
 
   signal[VARIABLES_DELETED] =
     g_signal_new ("variables_deleted",
-                 G_TYPE_FROM_CLASS(class),
+                 G_TYPE_FROM_CLASS (class),
                  G_SIGNAL_RUN_FIRST,
                  0,
                  NULL, NULL,
@@ -148,7 +148,7 @@ psppire_dict_class_init (PsppireDictClass *class)
 
   signal[VARIABLE_RESIZED] =
     g_signal_new ("dict-size-changed",
-                 G_TYPE_FROM_CLASS(class),
+                 G_TYPE_FROM_CLASS (class),
                  G_SIGNAL_RUN_FIRST,
                  0,
                  NULL, NULL,
@@ -243,9 +243,9 @@ void
 psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name)
 {
   struct variable *var ;
+  g_return_if_fail (idx >= 0);
   g_return_if_fail (d);
-  g_return_if_fail (G_IS_PSPPIRE_DICT(d));
-
+  g_return_if_fail (G_IS_PSPPIRE_DICT (d));
 
   if ( ! name )
     name = auto_generate_var_name (d);
@@ -253,8 +253,6 @@ psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name)
   var = dict_create_var (d->dict, name, 0);
 
   dict_reorder_var (d->dict, var, idx);
-
-  g_signal_emit (d, signal[VARIABLE_INSERTED], 0, idx );
 }
 
 /* Delete N variables beginning at FIRST */
@@ -264,7 +262,7 @@ psppire_dict_delete_variables (PsppireDict *d, gint first, gint n)
   gint idx;
   g_return_if_fail (d);
   g_return_if_fail (d->dict);
-  g_return_if_fail (G_IS_PSPPIRE_DICT(d));
+  g_return_if_fail (G_IS_PSPPIRE_DICT (d));
 
   for (idx = 0 ; idx < n ; ++idx )
     {
@@ -278,8 +276,6 @@ psppire_dict_delete_variables (PsppireDict *d, gint first, gint n)
       dict_delete_var (d->dict, var);
     }
   dict_compact_values (d->dict);
-
-  g_signal_emit (d, signal[VARIABLES_DELETED], 0, first, idx );
 }
 
 
@@ -288,7 +284,7 @@ psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
 {
   struct variable *var;
   g_assert (d);
-  g_assert (G_IS_PSPPIRE_DICT(d));
+  g_assert (G_IS_PSPPIRE_DICT (d));
 
 
   if ( idx < dict_get_var_cnt (d->dict))
@@ -296,13 +292,11 @@ psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
       /* This is an existing variable? */
       var = dict_get_var (d->dict, idx);
       dict_rename_var (d->dict, var, name);
-      g_signal_emit (d, signal[VARIABLE_CHANGED], 0, idx);
     }
   else
     {
       /* new variable */
       dict_create_var (d->dict, name, 0);
-      g_signal_emit (d, signal[VARIABLE_INSERTED], 0, idx);
     }
 }
 
@@ -346,15 +340,6 @@ psppire_dict_lookup_var (const PsppireDict *d, const gchar *name)
 }
 
 
-void
-psppire_dict_var_changed (PsppireDict *d, gint idx)
-{
-  g_return_if_fail (d);
-
-  g_signal_emit (d, signal[VARIABLE_CHANGED], 0, idx);
-}
-
-
 /* Clears the contents of D */
 void
 psppire_dict_clear (PsppireDict *d)
@@ -366,8 +351,6 @@ psppire_dict_clear (PsppireDict *d)
     const gint n_vars = dict_get_var_cnt (d->dict);
 
     dict_clear (d->dict);
-
-    g_signal_emit (d, signal[VARIABLES_DELETED], 0, 0, n_vars );
   }
 }
 
@@ -467,7 +450,7 @@ dictionary_tree_model_init (GtkTreeModelIface *iface)
 static GtkTreeModelFlags
 tree_model_get_flags (GtkTreeModel *model)
 {
-  g_return_val_if_fail (G_IS_PSPPIRE_DICT(model), (GtkTreeModelFlags) 0);
+  g_return_val_if_fail (G_IS_PSPPIRE_DICT (model), (GtkTreeModelFlags) 0);
 
   return GTK_TREE_MODEL_LIST_ONLY;
 }
@@ -482,7 +465,7 @@ tree_model_n_columns (GtkTreeModel *model)
 static GType
 tree_model_column_type (GtkTreeModel *model, gint index)
 {
-  g_return_val_if_fail (G_IS_PSPPIRE_DICT(model), (GType) 0);
+  g_return_val_if_fail (G_IS_PSPPIRE_DICT (model), (GType) 0);
 
   switch (index)
     {
@@ -612,9 +595,9 @@ tree_model_nth_child (GtkTreeModel *model, GtkTreeIter *iter,
                     GtkTreeIter *parent, gint n)
 {
   PsppireDict *dict;
-  g_return_val_if_fail (G_IS_PSPPIRE_DICT(model), FALSE);
+  g_return_val_if_fail (G_IS_PSPPIRE_DICT (model), FALSE);
 
-  dict = PSPPIRE_DICT(model);
+  dict = PSPPIRE_DICT (model);
 
   if ( parent )
     return FALSE;