[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/lib/gtksheet ChangeLog gtksheet.c gtksheet.h
From: |
John Darrington |
Subject: |
[Pspp-cvs] pspp/lib/gtksheet ChangeLog gtksheet.c gtksheet.h |
Date: |
Mon, 16 Jul 2007 11:18:09 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/07/16 11:18:09
Modified files:
lib/gtksheet : ChangeLog gtksheet.c gtksheet.h
Log message:
Removed legacy code.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/ChangeLog?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.c?cvsroot=pspp&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.h?cvsroot=pspp&r1=1.13&r2=1.14
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ChangeLog 12 Jul 2007 12:22:35 -0000 1.16
+++ ChangeLog 16 Jul 2007 11:18:09 -0000 1.17
@@ -1,3 +1,8 @@
+16 July 2007 John Darrington <address@hidden>
+
+ * 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 <address@hidden>
* gtksheet.c gtksheet.h: Removed view member and replaced with
Index: gtksheet.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gtksheet.c 13 Jul 2007 02:50:00 -0000 1.24
+++ gtksheet.c 16 Jul 2007 11:18:09 -0000 1.25
@@ -761,12 +761,11 @@
/* 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 @@
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 @@
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 @@
}
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 @@
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 @@
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);
Index: gtksheet.h
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtksheet.h 12 Jul 2007 12:22:35 -0000 1.13
+++ gtksheet.h 16 Jul 2007 11:18:09 -0000 1.14
@@ -559,18 +559,11 @@
/* 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
- [Pspp-cvs] pspp/lib/gtksheet ChangeLog gtksheet.c gtksheet.h,
John Darrington <=