Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...

Conflicts:

	lib/gtksheet/gtksheet.c

diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index 8e5e49c9d950b52f39ee6a5d677a66f25a5683e0..9f26115cecf19b01609a72b804cd8da8374f9aaf 100644 (file)
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -99,8 +99,6 @@ static void gtk_sheet_set_row_height (GtkSheet *sheet,
                                      gint row,
                                      guint height);
 
-static gboolean gtk_sheet_cell_empty (const GtkSheet *, gint, gint);
-
 static void destroy_hover_window (GtkSheetHoverTitle *);
 static GtkSheetHoverTitle *create_hover_window (void);
 
@@ -548,7 +546,6 @@ static void gtk_sheet_button_size_request    (GtkSheet *sheet,
                                                  const GtkSheetButton *button,
                                                  GtkRequisition *requisition);
 
-/* Memory allocation routines */
 static void gtk_sheet_real_cell_clear           (GtkSheet *sheet,
                                                  gint row,
                                                  gint column);
@@ -2497,21 +2494,6 @@ gtk_sheet_real_cell_clear (GtkSheet *sheet, gint row, gint column)
   dispose_string (sheet, old_text);
 }
 
-
-
-static gboolean
-gtk_sheet_cell_empty (const GtkSheet *sheet, gint row, gint col)
-{
-  gboolean empty;
-  char *text = gtk_sheet_cell_get_text (sheet, row, col);
-  empty = (text == NULL );
-
-  dispose_string (sheet, text);
-
-  return empty;
-}
-
-
 gchar *
 gtk_sheet_cell_get_text (const GtkSheet *sheet, gint row, gint col)
 {
@@ -4572,7 +4554,9 @@ gtk_sheet_key_press (GtkWidget *widget,
        g_sheet_row_get_row_count (sheet->row_geometry) - 1,
        sheet->active_cell.col);
       */
-
+      break;
+    case GDK_Delete:
+      gtk_sheet_real_cell_clear (sheet, sheet->active_cell.row, sheet->active_cell.col);
       break;
     default:
       return FALSE;