X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgtksheet.c;h=1f0e83fac72d6651c3e3ef79b19c240c96e00e0a;hb=c7f7bd52a51eb1784e31ea2cf2bf6601759d11f8;hp=3a6da7ecb3af10fbd63c62787fa12d4dc6c921a8;hpb=00f87914f662b50bcb9eaf432e10ef5c3f486086;p=pspp

diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index 3a6da7ecb3..1f0e83fac7 100644
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -96,15 +96,10 @@ enum
 #define CELL_SPACING 1
 #define DRAG_WIDTH 6
 #define TIMEOUT_HOVER 300
-#define TIME_INTERVAL 8
 #define COLUMN_MIN_WIDTH 10
-#define MINROWS 1
-#define MINCOLS 1
-#define MAXLENGTH 30
 #define CELLOFFSET 4
 #define DEFAULT_COLUMN_WIDTH 80
 
-
 static void gtk_sheet_update_primary_selection (GtkSheet *sheet);
 static void gtk_sheet_column_title_button_draw (GtkSheet *sheet, gint column);
 
@@ -202,7 +197,7 @@ yyy_row_is_visible (const GtkSheet *sheet, gint row)
 {
   GSheetRow *row_geo = sheet->row_geometry;
 
-  return g_sheet_row_get_visibility (row_geo, row, 0);
+  return g_sheet_row_get_visibility (row_geo, row);
 }
 
 
@@ -211,7 +206,7 @@ yyy_row_is_sensitive (const GtkSheet *sheet, gint row)
 {
   GSheetRow *row_geo = sheet->row_geometry;
 
-  return g_sheet_row_get_sensitivity (row_geo, row, 0);
+  return g_sheet_row_get_sensitivity (row_geo, row);
 }
 
 
@@ -221,7 +216,7 @@ yyy_row_count (const GtkSheet *sheet)
 {
   GSheetRow *row_geo = sheet->row_geometry;
 
-  return g_sheet_row_get_row_count (row_geo, 0);
+  return g_sheet_row_get_row_count (row_geo);
 }
 
 static inline gint
@@ -229,7 +224,7 @@ yyy_row_height (const GtkSheet *sheet, gint row)
 {
   GSheetRow *row_geo = sheet->row_geometry;
 
-  return g_sheet_row_get_height (row_geo, row, 0);
+  return g_sheet_row_get_height (row_geo, row);
 }
 
 static gint
@@ -237,7 +232,7 @@ yyy_row_top_ypixel (const GtkSheet *sheet, gint row)
 {
   GSheetRow *geo = sheet->row_geometry;
 
-  gint y = g_sheet_row_start_pixel (geo, row, 0);
+  gint y = g_sheet_row_start_pixel (geo, row);
 
   if ( sheet->column_titles_visible )
     y += sheet->column_title_area.height;
@@ -259,7 +254,7 @@ yyy_row_ypixel_to_row (const GtkSheet *sheet, gint y)
 
   if (y < cy) return 0;
 
-  return g_sheet_row_pixel_to_row (geo, y - cy, 0);
+  return g_sheet_row_pixel_to_row (geo, y - cy);
 }
 
 
@@ -434,7 +429,7 @@ yyy_row_button (GtkSheet *sheet, gint row)
 {
   GSheetRow *row_geo = sheet->row_geometry;
 
-  return g_sheet_row_get_button (row_geo, row, sheet);
+  return g_sheet_row_get_button (row_geo, row);
 }
 
 
@@ -444,7 +439,7 @@ static inline void
 yyy_set_row_height (GtkSheet *sheet, gint row, gint height)
 {
   if ( sheet->row_geometry )
-    g_sheet_row_set_height (sheet->row_geometry, row, height, sheet);
+    g_sheet_row_set_height (sheet->row_geometry, row, height);
 }
 
 
@@ -2445,7 +2440,10 @@ gtk_sheet_dispose  (GObject *object)
   if (sheet->column_geometry) g_object_unref (sheet->column_geometry);
 
   g_object_unref (sheet->entry_container);
+  sheet->entry_container = NULL;
+
   g_object_unref (sheet->button);
+  sheet->button = NULL;
 
   /* unref adjustments */
   if (sheet->hadjustment)
@@ -6693,9 +6691,9 @@ vadjustment_value_changed (GtkAdjustment * adjustment,
   old_value = - sheet->voffset;
 
   new_row = g_sheet_row_pixel_to_row (sheet->row_geometry,
-				      adjustment->value, sheet);
+				      adjustment->value);
 
-  y = g_sheet_row_start_pixel (sheet->row_geometry, new_row, sheet);
+  y = g_sheet_row_start_pixel (sheet->row_geometry, new_row);
 
   if (adjustment->value > sheet->old_vadjustment && sheet->old_vadjustment > 0. &&
       yyy_row_height (sheet, row) > sheet->vadjustment->step_increment)
@@ -7844,7 +7842,7 @@ gtk_sheet_button_new (void)
 }
 
 
-inline void
+void
 gtk_sheet_button_free (GtkSheetButton *button)
 {
   if (!button) return ;
@@ -7854,10 +7852,21 @@ gtk_sheet_button_free (GtkSheetButton *button)
 }
 
 
+static void
+append_cell_text (GString *string, const GtkSheet *sheet, gint r, gint c)
+{
+  gchar *celltext = gtk_sheet_cell_get_text (sheet, r, c);
+
+  if ( NULL == celltext)
+    return;
+
+  g_string_append (string, celltext);
+  g_free (celltext);
+}
+
 static GString *
 range_to_text (const GtkSheet *sheet)
 {
-  gchar *celltext = NULL;
   gint r, c;
   GString *string;
 
@@ -7870,16 +7879,12 @@ range_to_text (const GtkSheet *sheet)
     {
       for (c = sheet->range.col0; c < sheet->range.coli; ++c)
 	{
-	  celltext = gtk_sheet_cell_get_text (sheet, r, c);
-	  g_string_append (string, celltext);
+	  append_cell_text (string, sheet, r, c);
 	  g_string_append (string, "\t");
-	  g_free (celltext);
 	}
-      celltext = gtk_sheet_cell_get_text (sheet, r, c);
-      g_string_append (string, celltext);
+      append_cell_text (string, sheet, r, c);
       if ( r < sheet->range.rowi)
 	g_string_append (string, "\n");
-      g_free (celltext);
     }
 
   return string;
@@ -7888,7 +7893,6 @@ range_to_text (const GtkSheet *sheet)
 static GString *
 range_to_html (const GtkSheet *sheet)
 {
-  gchar *celltext = NULL;
   gint r, c;
   GString *string;
 
@@ -7906,10 +7910,8 @@ range_to_html (const GtkSheet *sheet)
       for (c = sheet->range.col0; c <= sheet->range.coli; ++c)
 	{
 	  g_string_append (string, "<td>");
-	  celltext = gtk_sheet_cell_get_text (sheet, r, c);
-	  g_string_append (string, celltext);
+	  append_cell_text (string, sheet, r, c);
 	  g_string_append (string, "</td>\n");
-	  g_free (celltext);
 	}
       g_string_append (string, "</tr>\n");
     }