X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-sheet.c;h=a4f082cca50bddb354b2559ce725896ba9c8c4fe;hb=66153a44d861ccddf6a176ec5a94ffb959232ad6;hp=696bab2150bab788b72f78a858261a77e2be0221;hpb=ebda03f4d53b24d1af3de9fd7dcbbf448401d5a9;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index 696bab21..a4f082cc 100644
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -260,10 +260,10 @@ traverse_cell_callback (PsppireSheet *sheet,
 
       const gchar *name = gtk_entry_get_text (entry);
 
-      if (! psppire_dict_check_name (var_store->dict, name, TRUE))
+      if (! psppire_dict_check_name (var_store->dictionary, name, TRUE))
 	return TRUE;
 
-      psppire_dict_insert_variable (var_store->dict, existing_cell->row, name);
+      psppire_dict_insert_variable (var_store->dictionary, existing_cell->row, name);
 
       return FALSE;
     }
@@ -278,7 +278,7 @@ traverse_cell_callback (PsppireSheet *sheet,
     {
       gint i;
       for ( i = n_vars ; i <= new_cell->row; ++i )
-	psppire_dict_insert_variable (var_store->dict, i, NULL);
+	psppire_dict_insert_variable (var_store->dictionary, i, NULL);
     }
 
   return FALSE;
@@ -363,11 +363,6 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
 	customEntry =
 	  PSPPIRE_CUSTOM_ENTRY (psppire_sheet_get_entry (sheet));
 
-	if ( var_is_long_string (var))
-	  g_object_set (customEntry,
-			"editable", FALSE,
-			NULL);
-
 	val_labs_dialog_set_target_variable (vs->val_labs_dialog, var);
 
 	g_signal_connect_swapped (customEntry,
@@ -386,15 +381,11 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
 	customEntry =
 	  PSPPIRE_CUSTOM_ENTRY (psppire_sheet_get_entry (sheet));
 
-	if ( var_is_long_string (var))
-	  g_object_set (customEntry,
-			"editable", FALSE,
-			NULL);
-
-
 	vs->missing_val_dialog->pv =
 	  psppire_var_store_get_var (var_store, row);
 
+	vs->missing_val_dialog->dict = var_store->dictionary;
+
 	g_signal_connect_swapped (customEntry,
 				  "clicked",
 				  G_CALLBACK (missing_val_dialog_show),
@@ -489,7 +480,9 @@ psppire_var_sheet_realize (GtkWidget *w)
 
   GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (vs));
 
-  vs->val_labs_dialog = val_labs_dialog_create (GTK_WINDOW (toplevel));
+  vs->val_labs_dialog = val_labs_dialog_create (GTK_WINDOW (toplevel),
+						PSPPIRE_VAR_STORE (psppire_sheet_get_model (PSPPIRE_SHEET (vs))));
+
   vs->missing_val_dialog = missing_val_dialog_create (GTK_WINDOW (toplevel));
   vs->var_type_dialog = var_type_dialog_create (GTK_WINDOW (toplevel));