X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=0ee608cadef083eacb9f770aecfb37ff9d32af72;hb=1c34ef6b7f0a6af23141cb117429ab46f8c3a6c5;hp=e6291b69c465535ee94434908070a9b78772d031;hpb=bea8b007855970c07083dbec5b5cc90f33990957;p=pspp

diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index e6291b69c4..0ee608cade 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,
@@ -134,10 +132,13 @@ psppire_dict_class_init (PsppireDictClass *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
+		  );
 
 
 
@@ -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),
@@ -256,15 +233,9 @@ delcb (struct dictionary *d, const struct variable *var,
 }
 
 static void
-mutcb (struct dictionary *d, int idx, 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)
+mutcb (struct dictionary *d, int idx, unsigned int what, const struct variable *oldvar, 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
@@ -567,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);
@@ -680,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;
@@ -732,11 +680,11 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
   struct variable *var;
   gint idx;
 
-  g_return_val_if_fail (iter->stamp == dict->stamp, FALSE);
-
   if ( iter == NULL || iter->user_data == NULL)
     return FALSE;
 
+  g_return_val_if_fail (iter->stamp == dict->stamp, FALSE);
+
   var = iter->user_data;
 
   idx = var_get_dict_index (var);