X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fval-labs-dialog.c;h=14eacabfadddb5842e81f444855233b0e903ec03;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=04f9534d55dd9f45f8163b07678ba065c977767b;hpb=729b96a6bd9342c45e6f65a113fd87c70da85b0a;p=pspp-builds.git

diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c
index 04f9534d..14eacabf 100644
--- a/src/ui/gui/val-labs-dialog.c
+++ b/src/ui/gui/val-labs-dialog.c
@@ -34,7 +34,8 @@ struct val_labs_dialog
 {
   GtkWidget *window;
 
-  PsppireSheet *vs;
+  PsppireVarStore *var_store;
+  PsppireDict *dict;
 
   /* The variable to be updated */
   struct variable *pv;
@@ -71,9 +72,10 @@ on_label_entry_change (GtkEntry *entry, gpointer data)
 
   text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
 
-  text_to_value (text, &v,
-		*var_get_write_format (dialog->pv));
-
+  text_to_value (text,
+		 dialog->dict,
+		 dialog->pv,
+		 &v);
 
   if (val_labs_find (dialog->labs, &v))
     {
@@ -85,6 +87,8 @@ on_label_entry_change (GtkEntry *entry, gpointer data)
       gtk_widget_set_sensitive (dialog->change_button, FALSE);
       gtk_widget_set_sensitive (dialog->add_button, TRUE);
     }
+
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 
@@ -141,8 +145,10 @@ on_value_entry_change (GtkEntry *entry, gpointer data)
   const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
 
   union value v;
-  text_to_value (text, &v,
-		*var_get_write_format (dialog->pv));
+  text_to_value (text,
+		 dialog->dict,
+		 dialog->pv,
+		 &v);
 
 
   g_signal_handler_block (GTK_ENTRY (dialog->label_entry),
@@ -166,6 +172,8 @@ on_value_entry_change (GtkEntry *entry, gpointer data)
 
   g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry),
 			 dialog->change_handler_id);
+
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 
@@ -202,14 +210,12 @@ val_labs_cancel (struct val_labs_dialog *dialog)
 
 /* Callback for when the Value Labels dialog is closed using
    the Cancel button.*/
-static gint
+static void
 on_cancel (GtkWidget *w, gpointer data)
 {
   struct val_labs_dialog *dialog = data;
 
   val_labs_cancel (dialog);
-
-  return FALSE;
 }
 
 
@@ -258,7 +264,7 @@ get_selected_tuple (struct val_labs_dialog *dialog,
 static void repopulate_dialog (struct val_labs_dialog *dialog);
 
 /* Callback which occurs when the "Change" button is clicked */
-static gint
+static void
 on_change (GtkWidget *w, gpointer data)
 {
   struct val_labs_dialog *dialog = data;
@@ -267,8 +273,10 @@ on_change (GtkWidget *w, gpointer data)
 
   union value v;
 
-  text_to_value (val_text, &v,
-		*var_get_write_format (dialog->pv));
+  text_to_value (val_text,
+		 dialog->dict,
+		 dialog->pv,
+		 &v);
 
   val_labs_replace (dialog->labs, &v,
 		    gtk_entry_get_text (GTK_ENTRY (dialog->label_entry)));
@@ -278,11 +286,11 @@ on_change (GtkWidget *w, gpointer data)
   repopulate_dialog (dialog);
   gtk_widget_grab_focus (dialog->value_entry);
 
-  return FALSE;
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 /* Callback which occurs when the "Add" button is clicked */
-static gint
+static void
 on_add (GtkWidget *w, gpointer data)
 {
   struct val_labs_dialog *dialog = data;
@@ -291,25 +299,26 @@ on_add (GtkWidget *w, gpointer data)
 
   const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry));
 
-  text_to_value (text, &v,
-		*var_get_write_format (dialog->pv));
-
+  text_to_value (text,
+		 dialog->dict,
+		 dialog->pv,
+		 &v);
 
-  if ( ! val_labs_add (dialog->labs, &v,
-		       gtk_entry_get_text
-		       ( GTK_ENTRY (dialog->label_entry)) ) )
-    return FALSE;
-
-  gtk_widget_set_sensitive (dialog->add_button, FALSE);
+  if (val_labs_add (dialog->labs, &v,
+		    gtk_entry_get_text
+		    ( GTK_ENTRY (dialog->label_entry)) ) )
+    {
+      gtk_widget_set_sensitive (dialog->add_button, FALSE);
 
-  repopulate_dialog (dialog);
-  gtk_widget_grab_focus (dialog->value_entry);
+      repopulate_dialog (dialog);
+      gtk_widget_grab_focus (dialog->value_entry);
+    }
 
-  return FALSE;
+  value_destroy (&v, var_get_width (dialog->pv));
 }
 
 /* Callback which occurs when the "Remove" button is clicked */
-static gint
+static void
 on_remove (GtkWidget *w, gpointer data)
 {
   struct val_labs_dialog *dialog = data;
@@ -326,8 +335,6 @@ on_remove (GtkWidget *w, gpointer data)
   gtk_widget_grab_focus (dialog->value_entry);
 
   gtk_widget_set_sensitive (dialog->remove_button, FALSE);
-
-  return FALSE;
 }
 
 
@@ -345,7 +352,7 @@ on_select_row (GtkTreeView *treeview, gpointer data)
   gchar *text;
 
   get_selected_tuple (dialog, &value, &label);
-  text = value_to_text (value, NULL, *var_get_write_format (dialog->pv));
+  text = value_to_text (value, dialog->dict, *var_get_write_format (dialog->pv));
 
   g_signal_handler_block (GTK_ENTRY (dialog->value_entry),
 			 dialog->value_handler_id);
@@ -374,7 +381,7 @@ on_select_row (GtkTreeView *treeview, gpointer data)
 /* Create a new dialog box
    (there should  normally be only one)*/
 struct val_labs_dialog *
-val_labs_dialog_create (GtkWindow *toplevel, PsppireSheet *sheet)
+val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store)
 {
   GtkTreeViewColumn *column;
 
@@ -384,10 +391,11 @@ val_labs_dialog_create (GtkWindow *toplevel, PsppireSheet *sheet)
 
   struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
 
+  dialog->var_store = var_store;
+  g_object_get (var_store, "dictionary", &dialog->dict, NULL);
   dialog->window = get_widget_assert (xml,"val_labs_dialog");
   dialog->value_entry = get_widget_assert (xml,"value_entry");
   dialog->label_entry = get_widget_assert (xml,"label_entry");
-  dialog->vs = sheet;
 
   gtk_window_set_transient_for
     (GTK_WINDOW (dialog->window), toplevel);
@@ -412,38 +420,38 @@ val_labs_dialog_create (GtkWindow *toplevel, PsppireSheet *sheet)
 
   g_signal_connect (get_widget_assert (xml, "val_labs_cancel"),
 		   "clicked",
-		   GTK_SIGNAL_FUNC (on_cancel), dialog);
+		   G_CALLBACK (on_cancel), dialog);
 
   g_signal_connect (dialog->window, "delete-event",
-		    GTK_SIGNAL_FUNC (on_delete), dialog);
+		    G_CALLBACK (on_delete), dialog);
 
   g_signal_connect (get_widget_assert (xml, "val_labs_ok"),
 		   "clicked",
-		   GTK_SIGNAL_FUNC (val_labs_ok), dialog);
+		   G_CALLBACK (val_labs_ok), dialog);
 
   dialog->change_handler_id =
     g_signal_connect (dialog->label_entry,
 		     "changed",
-		     GTK_SIGNAL_FUNC (on_label_entry_change), dialog);
+		     G_CALLBACK (on_label_entry_change), dialog);
 
   dialog->value_handler_id  =
     g_signal_connect (dialog->value_entry,
 		     "changed",
-		     GTK_SIGNAL_FUNC (on_value_entry_change), dialog);
+		     G_CALLBACK (on_value_entry_change), dialog);
 
   g_signal_connect (dialog->change_button,
 		   "clicked",
-		   GTK_SIGNAL_FUNC (on_change), dialog);
+		   G_CALLBACK (on_change), dialog);
 
 
   g_signal_connect (dialog->treeview, "cursor-changed",
-		   GTK_SIGNAL_FUNC (on_select_row), dialog);
+		   G_CALLBACK (on_select_row), dialog);
 
   g_signal_connect (dialog->remove_button, "clicked",
-		   GTK_SIGNAL_FUNC (on_remove), dialog);
+		   G_CALLBACK (on_remove), dialog);
 
   g_signal_connect (dialog->add_button, "clicked",
-		   GTK_SIGNAL_FUNC (on_add), dialog);
+		   G_CALLBACK (on_add), dialog);
 
   dialog->labs = 0;
 
@@ -497,7 +505,7 @@ repopulate_dialog (struct val_labs_dialog *dialog)
       const struct val_lab *vl = labels[i];
 
       gchar *const vstr  =
-	value_to_text (vl->value, NULL,
+	value_to_text (vl->value, dialog->dict,
 		      *var_get_write_format (dialog->pv));
 
       gchar *const text = g_strdup_printf ("%s = \"%s\"",