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

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index a4f082cca5..48f34f6d03 100644
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -251,6 +251,9 @@ traverse_cell_callback (PsppireSheet *sheet,
 
   gint n_vars = psppire_var_store_get_var_cnt (var_store);
 
+  if (new_cell->col >=  PSPPIRE_VAR_STORE_n_COLS)
+    return TRUE;
+
   if (new_cell->row >= n_vars && !var_sheet->may_create_vars)
     return TRUE;
 
@@ -450,9 +453,9 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
 		  }
 
 		adj = gtk_adjustment_new (current_value,
-					 r_min, r_max,
-					 1.0, 1.0, 1.0 /* steps */
-					 );
+					  r_min, r_max,
+					  1.0, 1.0, /* steps */
+					  0);
 
 		psppire_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
 
@@ -484,7 +487,8 @@ psppire_var_sheet_realize (GtkWidget *w)
 						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));
+  vs->var_type_dialog = var_type_dialog_create (GTK_WINDOW (toplevel),
+						PSPPIRE_VAR_STORE (psppire_sheet_get_model (PSPPIRE_SHEET (vs))));
 
   /* Chain up to the parent class */
   GTK_WIDGET_CLASS (parent_class)->realize (w);