Removed legacy code.

diff --git a/lib/gtksheet/ChangeLog b/lib/gtksheet/ChangeLog
index d6b29286b7c553d29eb0abcc1d959f7b697193c7..c85d0063fe91247b4cd824d26718a44828f21c9e 100644 (file)
--- a/lib/gtksheet/ChangeLog
+++ b/lib/gtksheet/ChangeLog
@@ -1,3 +1,8 @@
+16 July 2007 John Darrington <john@darrington.wattle.id.au>
+
+       * gtksheet.c gtksheet.h: Removed some legacy functions called from 
+       gtk_sheet_finalize which caused unnecessary delays when shutting down.
+
 12 July 2007 John Darrington <john@darrington.wattle.id.au>
 
        * gtksheet.c gtksheet.h: Removed view member and replaced with 

diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index b96bb32291f2d71ad3a48d681ddb9dbc2e1f8c9c..00978dd05abc3233e81aad11a0259cfb90c1d789 100644 (file)
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -761,12 +761,11 @@ static void init_attributes                        (const GtkSheet *sheet, gint col,
 
 /* Memory allocation routines */
 static void gtk_sheet_real_range_clear                  (GtkSheet *sheet,
-                                                 const GtkSheetRange *range,
-                                                 gboolean delete);
+                                                 const GtkSheetRange *range);
+
 static void gtk_sheet_real_cell_clear           (GtkSheet *sheet,
                                                  gint row,
-                                                 gint column,
-                                                 gboolean delete);
+                                                 gint column);
 
 
 /* Container Functions */
@@ -2612,10 +2611,6 @@ gtk_sheet_finalize (GObject * object)
 
   sheet = GTK_SHEET (object);
 
-  /* get rid of all the cells */
-  gtk_sheet_range_clear (sheet, NULL);
-  gtk_sheet_range_delete (sheet, NULL);
-
   if (sheet->name)
     {
       g_free (sheet->name);
@@ -3671,30 +3666,7 @@ gtk_sheet_cell_clear (GtkSheet *sheet, gint row, gint column)
   range.col0 = MIN_VISIBLE_COLUMN (sheet);
   range.coli = MAX_VISIBLE_COLUMN (sheet);
 
-  gtk_sheet_real_cell_clear (sheet, row, column, FALSE);
-
-  if (!GTK_SHEET_IS_FROZEN (sheet))
-    {
-      gtk_sheet_range_draw (sheet, &range);
-    }
-}
-
-void
-gtk_sheet_cell_delete (GtkSheet *sheet, gint row, gint column)
-{
-  GtkSheetRange range;
-
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-  if (column >= xxx_column_count (sheet) || row >= yyy_row_count (sheet)) return;
-  if (column < 0 || row < 0) return;
-
-  range.row0 = row;
-  range.rowi = row;
-  range.col0 = MIN_VISIBLE_COLUMN (sheet);
-  range.coli = MAX_VISIBLE_COLUMN (sheet);
-
-  gtk_sheet_real_cell_clear (sheet, row, column, TRUE);
+  gtk_sheet_real_cell_clear (sheet, row, column);
 
   if (!GTK_SHEET_IS_FROZEN (sheet))
     {
@@ -3703,7 +3675,7 @@ gtk_sheet_cell_delete (GtkSheet *sheet, gint row, gint column)
 }
 
 static void
-gtk_sheet_real_cell_clear (GtkSheet *sheet, gint row, gint column, gboolean delete)
+gtk_sheet_real_cell_clear (GtkSheet *sheet, gint row, gint column)
 {
   GSheetModel *model = gtk_sheet_get_model (sheet);
 
@@ -3727,22 +3699,11 @@ gtk_sheet_range_clear (GtkSheet *sheet, const GtkSheetRange *range)
   g_return_if_fail (sheet != NULL);
   g_return_if_fail (GTK_IS_SHEET (sheet));
 
-  gtk_sheet_real_range_clear (sheet, range, FALSE);
+  gtk_sheet_real_range_clear (sheet, range);
 }
 
-void
-gtk_sheet_range_delete (GtkSheet *sheet, const GtkSheetRange *range)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  gtk_sheet_real_range_clear (sheet, range, TRUE);
-}
-
-
 static void
-gtk_sheet_real_range_clear (GtkSheet *sheet, const GtkSheetRange *range,
-                           gboolean delete)
+gtk_sheet_real_range_clear (GtkSheet *sheet, const GtkSheetRange *range)
 {
   gint i, j;
   GtkSheetRange clear;
@@ -3765,7 +3726,7 @@ gtk_sheet_real_range_clear (GtkSheet *sheet, const GtkSheetRange *range,
   for (i = clear.row0; i <= clear.rowi; i++)
     for (j = clear.col0; j <= clear.coli; j++)
       {
-       gtk_sheet_real_cell_clear (sheet, i, j, delete);
+       gtk_sheet_real_cell_clear (sheet, i, j);
       }
 
   gtk_sheet_range_draw (sheet, NULL);

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index ca0dc4f9db49907add483a41beb7991814f2b23a..efce203b014726bdfb34aeae6ef83a790660d575 100644 (file)
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -559,18 +559,11 @@ gtk_sheet_cell_get_text           (const GtkSheet *sheet, gint row, gint col);
 /* clear cell contents */
 void
 gtk_sheet_cell_clear                   (GtkSheet *sheet, gint row, gint col);
-/* clear cell contents and remove links */
-void
-gtk_sheet_cell_delete                  (GtkSheet *sheet, gint row, gint col);
 
 /* clear range contents. If range==NULL the whole sheet will be cleared */
 void
 gtk_sheet_range_clear                  (GtkSheet *sheet,
                                         const GtkSheetRange *range);
-/* clear range contents and remove links */
-void
-gtk_sheet_range_delete                 (GtkSheet *sheet,
-                                        const GtkSheetRange *range);
 
 /* get cell state: GTK_STATE_NORMAL, GTK_STATE_SELECTED */
 GtkStateType