Remove commented code

[pspp-builds.git] / lib / gtk-contrib / psppire-sheet.c

diff --git a/lib/gtk-contrib/psppire-sheet.c b/lib/gtk-contrib/psppire-sheet.c
index 63307d8f51249a1a97ceae37c449f3ed24c9c789..6d1c0af9755cdeeeaee47dada8587dbffc81907f 100644 (file)
--- a/lib/gtk-contrib/psppire-sheet.c
+++ b/lib/gtk-contrib/psppire-sheet.c
@@ -387,7 +387,7 @@ POSSIBLE_RESIZE (const PsppireSheet *sheet, gint x, gint y,
 }
 
 
-static gboolean
+static void
 rectangle_from_range (PsppireSheet *sheet, const PsppireSheetRange *range,
                      GdkRectangle *r)
 {
@@ -424,22 +424,20 @@ rectangle_from_range (PsppireSheet *sheet, const PsppireSheetRange *range,
     {
       r->x += sheet->row_title_area.width;
     }
-
-  return TRUE;
 }
 
-static gboolean
+static void
 rectangle_from_cell (PsppireSheet *sheet, gint row, gint col,
                     GdkRectangle *r)
 {
   PsppireSheetRange range;
-  g_return_val_if_fail (row >= 0, FALSE);
-  g_return_val_if_fail (col >= 0, FALSE);
+  g_return_if_fail (row >= 0);
+  g_return_if_fail (col >= 0);
 
   range.row0 = range.rowi = row;
   range.col0 = range.coli = col;
 
-  return rectangle_from_range (sheet, &range, r);
+  rectangle_from_range (sheet, &range, r);
 }
 
 
@@ -2779,30 +2777,15 @@ psppire_sheet_expose (GtkWidget *widget, GdkEventExpose *event)
 
       if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
        {
-#if 0
-         if (psppire_sheet_range_isvisible (sheet, &sheet->range))
-           psppire_sheet_range_draw (sheet, &sheet->range);
+         GdkRectangle area;
 
-         if (PSPPIRE_SHEET_IN_RESIZE (sheet) || PSPPIRE_SHEET_IN_DRAG (sheet))
-           psppire_sheet_range_draw (sheet, &sheet->drag_range);
-#endif
-
-           {
-             GdkRectangle area;
-
-             rectangle_from_range (sheet, &sheet->range, &area);
+         rectangle_from_range (sheet, &sheet->range, &area);
              
-             gdk_draw_rectangle (sheet->sheet_window,
-                                 sheet->xor_gc,
-                                 TRUE,
-                                 area.x + 1, area.y + 1,
-                                 area.width, area.height);
-           }
-
-#if 0
-         if (PSPPIRE_SHEET_IN_RESIZE (sheet) || PSPPIRE_SHEET_IN_DRAG (sheet))
-           draw_xor_rectangle (sheet, sheet->drag_range);
-#endif
+         gdk_draw_rectangle (sheet->sheet_window,
+                             sheet->xor_gc,
+                             TRUE,
+                             area.x + 1, area.y + 1,
+                             area.width, area.height);
        }