X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=b88bbe7766300a6a110bd211902c5e5aa95691c7;hb=2d82411f69f2a87a04ed22de78717bacf7d342de;hp=16576dc3aa5f80e38b58c8e21f24805b85ba236d;hpb=edf4f6b1f7e2b9c17cc86f1c63ff9b4b7e24af26;p=pspp

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index 16576dc3aa..b88bbe7766 100644
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -41,10 +41,8 @@ enum  {
   BACKEND_CHANGED,
 
   VARIABLE_CHANGED,
-  VARIABLE_RESIZED,
   VARIABLE_INSERTED,
   VARIABLE_DELETED,
-  VARIABLE_DISPLAY_WIDTH_CHANGED,
 
   WEIGHT_CHANGED,
   FILTER_CHANGED,
@@ -56,7 +54,7 @@ enum  {
 /* --- prototypes --- */
 static void psppire_dict_class_init	(PsppireDictClass	*class);
 static void psppire_dict_init	(PsppireDict		*dict);
-static void psppire_dict_finalize	(GObject		*object);
+static void psppire_dict_dispose	(GObject		*object);
 
 static void dictionary_tree_model_init (GtkTreeModelIface *iface);
 
@@ -115,7 +113,7 @@ psppire_dict_class_init (PsppireDictClass *class)
 
   parent_class = g_type_class_peek_parent (class);
 
-  object_class->finalize = psppire_dict_finalize;
+  object_class->dispose = psppire_dict_dispose;
 
   signals [BACKEND_CHANGED] =
     g_signal_new ("backend-changed",
@@ -129,20 +127,23 @@ psppire_dict_class_init (PsppireDictClass *class)
 
 
   signals [VARIABLE_CHANGED] =
-    g_signal_new ("variable_changed",
+    g_signal_new ("variable-changed",
 		  G_TYPE_FROM_CLASS (class),
 		  G_SIGNAL_RUN_FIRST,
 		  0,
 		  NULL, NULL,
-		  g_cclosure_marshal_VOID__INT,
+		  psppire_marshal_VOID__INT_UINT_POINTER,
 		  G_TYPE_NONE,
-		  1,
-		  G_TYPE_INT);
+		  3,
+		  G_TYPE_INT,
+		  G_TYPE_UINT,
+		  G_TYPE_POINTER
+		  );
 
 
 
   signals [VARIABLE_INSERTED] =
-    g_signal_new ("variable_inserted",
+    g_signal_new ("variable-inserted",
 		  G_TYPE_FROM_CLASS (class),
 		  G_SIGNAL_RUN_FIRST,
 		  0,
@@ -167,30 +168,6 @@ psppire_dict_class_init (PsppireDictClass *class)
 		  G_TYPE_INT);
 
 
-  signals [VARIABLE_RESIZED] =
-    g_signal_new ("dict-size-changed",
-		  G_TYPE_FROM_CLASS (class),
-		  G_SIGNAL_RUN_FIRST,
-		  0,
-		  NULL, NULL,
-		  psppire_marshal_VOID__INT_INT,
-		  G_TYPE_NONE,
-		  2,
-		  G_TYPE_INT,
-		  G_TYPE_INT);
-
-  signals [VARIABLE_DISPLAY_WIDTH_CHANGED] =
-    g_signal_new ("variable-display-width-changed",
-		  G_TYPE_FROM_CLASS (class),
-		  G_SIGNAL_RUN_FIRST,
-		  0,
-		  NULL, NULL,
-		  g_cclosure_marshal_VOID__INT,
-		  G_TYPE_NONE,
-		  1,
-		  G_TYPE_INT);
-
-
   signals [WEIGHT_CHANGED] =
     g_signal_new ("weight-changed",
 		  G_TYPE_FROM_CLASS (class),
@@ -227,13 +204,13 @@ psppire_dict_class_init (PsppireDictClass *class)
 }
 
 static void
-psppire_dict_finalize (GObject *object)
+psppire_dict_dispose (GObject *object)
 {
   PsppireDict *d = PSPPIRE_DICT (object);
 
-  dict_destroy (d->dict);
+  dict_set_callbacks (d->dict, NULL, NULL);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 /* Pass on callbacks from src/data/dictionary, as
@@ -256,15 +233,9 @@ delcb (struct dictionary *d, const struct variable *var,
 }
 
 static void
-mutcb (struct dictionary *d, int idx, void *pd)
+mutcb (struct dictionary *d, int idx, unsigned int what, const struct variable *oldvar, void *pd)
 {
-  g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx);
-}
-
-static void
-resize_cb (struct dictionary *d, int idx, int old_width, void *pd)
-{
-  g_signal_emit (pd, signals [VARIABLE_RESIZED], 0, idx, old_width);
+  g_signal_emit (pd, signals [VARIABLE_CHANGED], 0, idx, what, oldvar);
 }
 
 static void
@@ -285,24 +256,14 @@ split_changed_callback (struct dictionary *d, void *pd)
   g_signal_emit (pd, signals [SPLIT_CHANGED], 0);
 }
 
-static void
-variable_display_width_callback (struct dictionary *d, int idx, void *pd)
-{
-  g_signal_emit (pd, signals [VARIABLE_DISPLAY_WIDTH_CHANGED], 0, idx);
-}
-
-
-
 static const struct dict_callbacks gui_callbacks =
   {
     addcb,
     delcb,
     mutcb,
-    resize_cb,
     weight_changed_callback,
     filter_changed_callback,
-    split_changed_callback,
-    variable_display_width_callback
+    split_changed_callback
   };
 
 static void
@@ -464,14 +425,17 @@ psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
 
 
 
-/* Return the IDXth variable in D. */
+/* Return the IDXth variable.
+   Will return NULL if IDX  exceeds the number of variables in the dictionary.
+ */
 struct variable *
 psppire_dict_get_variable (const PsppireDict *d, gint idx)
 {
   g_return_val_if_fail (d, NULL);
   g_return_val_if_fail (d->dict, NULL);
-  g_return_val_if_fail (idx < 0, NULL);
-  g_return_val_if_fail (dict_get_var_cnt (d->dict) <= idx, NULL);
+
+  if ( dict_get_var_cnt (d->dict) <= idx )
+    return NULL;
 
   return dict_get_var (d->dict, idx);
 }
@@ -564,22 +528,6 @@ psppire_dict_get_next_value_idx (const PsppireDict *dict)
 }
 
 
-void
-psppire_dict_resize_variable (PsppireDict *d, const struct variable *pv,
-			      gint old_size, gint new_size)
-{
-  g_return_if_fail (d);
-  g_return_if_fail (d->dict);
-
-  if ( old_size == new_size )
-    return ;
-
-  g_signal_emit (d, signals [VARIABLE_RESIZED], 0,
-		 var_get_dict_index (pv),
-		 new_size - old_size );
-}
-
-
 /* Tree Model Stuff */
 
 static GtkTreeModelFlags tree_model_get_flags (GtkTreeModel *model);
@@ -677,6 +625,9 @@ tree_model_column_type (GtkTreeModel *model, gint index)
     case DICT_TVM_COL_VAR:
       return PSPPIRE_VAR_PTR_TYPE;
       break;
+    case DICT_TVM_COL_LABEL:
+      return G_TYPE_STRING;
+      break;
     default:
       g_return_val_if_reached ((GType)0);
       break;