X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtk-contrib%2Fpsppire-sheet.c;h=ecadf742cbb9e0b874bf207ecaeae832072e17b9;hb=c3f06028950f69cd695062fe01a64ba73e164b3e;hp=89fd45d3fc491a931b9f3c72bdb46b947801c468;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp

diff --git a/lib/gtk-contrib/psppire-sheet.c b/lib/gtk-contrib/psppire-sheet.c
index 89fd45d3fc..ecadf742cb 100644
--- a/lib/gtk-contrib/psppire-sheet.c
+++ b/lib/gtk-contrib/psppire-sheet.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006, 2008, 2009 Free Software Foundation
+  Copyright (C) 2006, 2008, 2009, 2011 Free Software Foundation
 
   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
@@ -545,9 +545,6 @@ static void draw_row_title_buttons 	 (PsppireSheet *sheet);
 
 
 static void size_allocate_global_button 	 (PsppireSheet *sheet);
-static void psppire_sheet_button_size_request	 (PsppireSheet *sheet,
-						  const PsppireSheetButton *button,
-						  GtkRequisition *requisition);
 
 static void psppire_sheet_real_cell_clear 		 (PsppireSheet *sheet,
 							  gint row,
@@ -2724,13 +2721,17 @@ psppire_sheet_select_range (PsppireSheet *sheet, const PsppireSheetRange *range)
 void
 psppire_sheet_unselect_range (PsppireSheet *sheet)
 {
-  GdkRectangle area;
   sheet->select_status = PSPPIRE_SHEET_NORMAL;
 
-  rectangle_from_range (sheet, &sheet->range, &area);
-  area.x++;
-  area.y++;
-  gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);	
+  if (sheet->sheet_window != NULL)
+    {
+      GdkRectangle area;
+
+      rectangle_from_range (sheet, &sheet->range, &area);
+      area.x++;
+      area.y++;
+      gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
+    }
 
   g_signal_emit (sheet, sheet_signals [SELECT_COLUMN], 0, -1);
   g_signal_emit (sheet, sheet_signals [SELECT_ROW], 0, -1);  
@@ -3022,9 +3023,7 @@ psppire_sheet_click_cell (PsppireSheet *sheet, gint row, gint column)
       sheet->range.row0 = 0;
       sheet->range.col0 = 0;
       sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
-      sheet->range.coli =
-	psppire_axis_unit_count (sheet->haxis) - 1;
-      psppire_sheet_select_range (sheet, NULL);
+      sheet->range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
       return TRUE;
     }
 
@@ -4680,27 +4679,6 @@ psppire_sheet_get_attributes (const PsppireSheet *sheet, gint row, gint col,
   return TRUE;
 }
 
-static void
-psppire_sheet_button_size_request	 (PsppireSheet *sheet,
-					  const PsppireSheetButton *button,
-					  GtkRequisition *button_requisition)
-{
-  GtkRequisition requisition;
-  GtkRequisition label_requisition;
-
-  label_requisition.height = DEFAULT_ROW_HEIGHT;
-  label_requisition.width = COLUMN_MIN_WIDTH;
-
-  requisition.height = DEFAULT_ROW_HEIGHT;
-  requisition.width = COLUMN_MIN_WIDTH;
-
-
-  *button_requisition = requisition;
-  button_requisition->width = MAX (requisition.width, label_requisition.width);
-  button_requisition->height = MAX (requisition.height, label_requisition.height);
-
-}
-
 static void
 psppire_sheet_forall (GtkContainer *container,
 		      gboolean include_internals,