New file: builder-wrapper.h and builder-wrapper.c

[pspp-builds.git] / src / ui / gui / psppire-var-sheet.c

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index 94b88050a135d2d90fcb6a313fa7181cc2dbd60f..648d9fd786ee149bdeafd7e972c382d4893dc66a 100644 (file)
--- 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, 2011 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
@@ -18,6 +18,7 @@
 #include "psppire-var-sheet.h"
 #include <ui/gui/sheet/psppire-axis.h>
 
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include "customentry.h"
@@ -251,6 +252,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;
 
@@ -260,10 +264,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 +282,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 +367,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,12 +385,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);
-
-
        vs->missing_val_dialog->pv =
          psppire_var_store_get_var (var_store, row);
 
@@ -439,7 +432,7 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
                const gint current_value  = g_strtod (s, NULL);
                GtkObject *adj ;
 
-               const struct fmt_spec *fmt = var_get_write_format (var);
+               const struct fmt_spec *fmt = var_get_print_format (var);
                switch (column)
                  {
                  case PSPPIRE_VAR_STORE_COL_WIDTH:
@@ -459,9 +452,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);
 
@@ -489,8 +482,8 @@ 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),
-                                               PSPPIRE_SHEET (vs));
+  vs->val_labs_dialog = val_labs_dialog_create (GTK_WINDOW (toplevel));
+
   vs->missing_val_dialog = missing_val_dialog_create (GTK_WINDOW (toplevel));
   vs->var_type_dialog = var_type_dialog_create (GTK_WINDOW (toplevel));