X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtk-contrib%2Fpsppire-sheet.c;h=19406edc9c9418d344a343e232a64cb42c61299b;hb=9d9870db0d89e8f7f72de8ff5c9d37c8d9eb15c2;hp=7f4c1fed416caa306682488a751c03557e0da674;hpb=acc57a6e232eb2b462d4753a65478ce407e20f63;p=pspp

diff --git a/lib/gtk-contrib/psppire-sheet.c b/lib/gtk-contrib/psppire-sheet.c
index 7f4c1fed41..19406edc9c 100644
--- a/lib/gtk-contrib/psppire-sheet.c
+++ b/lib/gtk-contrib/psppire-sheet.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006, 2008, 2009, 2011 Free Software Foundation
+  Copyright (C) 2006, 2008, 2009, 2011, 2012 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
@@ -444,7 +444,6 @@ rectangle_from_cell (PsppireSheet *sheet, gint row, gint col,
 static void psppire_sheet_class_init 		 (PsppireSheetClass *klass);
 static void psppire_sheet_init 			 (PsppireSheet *sheet);
 static void psppire_sheet_dispose 			 (GObject *object);
-static void psppire_sheet_finalize 			 (GObject *object);
 static void psppire_sheet_style_set 		 (GtkWidget *widget,
 						  GtkStyle *previous_style);
 static void psppire_sheet_realize 			 (GtkWidget *widget);
@@ -1036,7 +1035,6 @@ psppire_sheet_class_init (PsppireSheetClass *klass)
   container_class->set_focus_child = NULL;
 
   object_class->dispose = psppire_sheet_dispose;
-  object_class->finalize = psppire_sheet_finalize;
 
   cell_padding_spec =
     g_param_spec_boxed ("cell-padding",
@@ -1695,20 +1693,6 @@ psppire_sheet_set_scroll_adjustments (PsppireSheet *sheet,
   return TRUE;
 }
 
-static void
-psppire_sheet_finalize (GObject *object)
-{
-  PsppireSheet *sheet;
-
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (PSPPIRE_IS_SHEET (object));
-
-  sheet = PSPPIRE_SHEET (object);
-
-  if (G_OBJECT_CLASS (parent_class)->finalize)
-    (*G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
 static void
 psppire_sheet_dispose  (GObject *object)
 {
@@ -4141,7 +4125,7 @@ draw_button (PsppireSheet *sheet, GdkWindow *window,
 	     GdkRectangle allocation)
 {
   GtkShadowType shadow_type;
-  gint text_width = 0, text_height = 0;
+  gint text_width = 0;
   PangoAlignment align = PANGO_ALIGN_LEFT;
 
   gboolean rtl ;
@@ -4206,9 +4190,6 @@ draw_button (PsppireSheet *sheet, GdkWindow *window,
 
   if (button->label_visible)
     {
-      text_height = DEFAULT_ROW_HEIGHT -
-	2 * COLUMN_TITLES_HEIGHT;
-
       gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->fg_gc[button->state],
 				 &allocation);
       gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->white_gc,