X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-sheet.c;h=66a95deeed2ad4831cd712d6b016600fcbe6f38a;hb=7ef0d7851bafb01ad78c03d66d344fa3ea6f31c6;hp=bb2c56ba7aa9ee27257cf2470b57d2efe53fee19;hpb=da8c6e44f6e8acaa04887901da4d835437221ccf;p=pspp

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index bb2c56ba7a..66a95deeed 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, 2009, 2011, 2012, 2013 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011, 2012, 2013, 2014 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
@@ -195,7 +195,7 @@ on_var_column_edited (GtkCellRendererText *cell,
             {
               gtk_widget_queue_resize (GTK_WIDGET (var_sheet));
               var_sheet->scroll_to_bottom_signal =
-                g_signal_connect (var_sheet, "size-request",
+                g_signal_connect (var_sheet, "size-allocate",
                                   G_CALLBACK (scroll_to_bottom), NULL);
             }
         }
@@ -252,7 +252,7 @@ on_var_column_edited (GtkCellRendererText *cell,
       break;
 
     case VS_LABEL:
-      var_set_label (var, new_text, false);
+      var_set_label (var, new_text);
       break;
 
     case VS_VALUES:
@@ -362,6 +362,7 @@ render_var_cell (PsppSheetViewColumn *tree_column,
                                                   "column-number")) - 1;
   row = GPOINTER_TO_INT (iter->user_data);
 
+  gtk_cell_renderer_set_visible (cell, true);
   if (row >= psppire_dict_get_var_cnt (var_sheet->dict))
     {
       if (GTK_IS_CELL_RENDERER_TEXT (cell))
@@ -376,7 +377,9 @@ render_var_cell (PsppSheetViewColumn *tree_column,
             g_object_set (cell, "adjustment", NULL, NULL);
         }
       else
-        g_object_set (cell, "stock-id", "", NULL);
+	{
+	  gtk_cell_renderer_set_visible (cell, false);
+	}
       return;
     }
 
@@ -585,8 +588,9 @@ get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
   g_object_set (G_OBJECT (renderer),
                 PSPPIRE_IS_CELL_RENDERER_BUTTON (renderer) ? "label" : "text",
                 string, (void *) NULL);
-  gtk_cell_renderer_get_size (renderer, GTK_WIDGET (treeview),
-                              NULL, NULL, NULL, &width, NULL);
+
+  gtk_cell_renderer_get_preferred_width (renderer, GTK_WIDGET (treeview), NULL, &width);
+
   return width;
 }
 
@@ -1110,6 +1114,9 @@ psppire_var_sheet_dispose (GObject *obj)
   g_object_unref (var_sheet->var_type_dialog);
   */
 
+  g_object_unref (var_sheet->builder);
+
+  
   G_OBJECT_CLASS (psppire_var_sheet_parent_class)->dispose (obj);
 }
 
@@ -1270,7 +1277,7 @@ on_edit_clear_variables (GtkAction *action, PsppireVarSheet *var_sheet)
       for (i = 1; i <= range_set_node_get_width (node); i++)
         {
           unsigned long row = range_set_node_get_end (node) - i;
-          if (row >= 0 && row < psppire_dict_get_var_cnt (dict))
+          if (row < psppire_dict_get_var_cnt (dict))
             psppire_dict_delete_variables (dict, row, 1);
         }
     }