X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgsheet-uniform-row.c;h=7ab9b600a148ec4effc607193e11386d59b7cdb1;hb=f1861ea4c715dfaddd84ff14be2ab92b13379014;hp=83791adaff055ae29024118d03f87a4547fcda9e;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git

diff --git a/lib/gtksheet/gsheet-uniform-row.c b/lib/gtksheet/gsheet-uniform-row.c
index 83791ada..7ab9b600 100644
--- a/lib/gtksheet/gsheet-uniform-row.c
+++ b/lib/gtksheet/gsheet-uniform-row.c
@@ -96,7 +96,7 @@ g_sheet_uniform_row_new (gint height, gint n_rows)
 }
 
 static gint
-g_sheet_uniform_row_get_height(const GSheetRow *geom, gint u, gpointer data)
+g_sheet_uniform_row_get_height (const GSheetRow *geom, glong u)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geom);
 
@@ -104,7 +104,7 @@ g_sheet_uniform_row_get_height(const GSheetRow *geom, gint u, gpointer data)
 }
 
 static gboolean
-g_sheet_uniform_row_get_sensitivity(const GSheetRow *geom, gint u, gpointer data)
+g_sheet_uniform_row_get_sensitivity (const GSheetRow *geom, glong u)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geom);
 
@@ -113,26 +113,26 @@ g_sheet_uniform_row_get_sensitivity(const GSheetRow *geom, gint u, gpointer data
 
 
 static gboolean
-g_sheet_uniform_row_get_visibility(const GSheetRow *geom, gint u, gpointer data)
+g_sheet_uniform_row_get_visibility (const GSheetRow *geom, glong u)
 {
-  GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geom);
+  GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW (geom);
 
   return ug->is_visible;
 }
 
 
 static gchar *
-g_sheet_uniform_row_get_button_label(const GSheetRow *geom, gint u, gpointer data)
+g_sheet_uniform_row_get_button_label (const GSheetRow *geom, glong u)
 {
-  gchar *label = g_strdup_printf("%d", u);
+  gchar *label = g_strdup_printf("%ld", u);
 
   return label;
 }
 
 
 
-static gint
-g_sheet_uniform_row_get_row_count(const GSheetRow *geom, gpointer data)
+static glong
+g_sheet_uniform_row_get_row_count (const GSheetRow *geom)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geom);
 
@@ -159,29 +159,28 @@ g_sheet_uniform_row_init (GSheetUniformRow *o)
 }
 
 static void
-g_sheet_uniform_row_finalize (GObject           *object)
+g_sheet_uniform_row_finalize (GObject *object)
 {
 }
 
 
 static guint
-g_sheet_uniform_row_top_ypixel(const GSheetRow *geo, gint row, gpointer data)
+g_sheet_uniform_row_top_ypixel (const GSheetRow *geo, glong row)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geo);
 
   return row * ug->height;
 }
 
-static gint
-g_sheet_uniform_row_pixel_to_row(const GSheetRow *geo, guint pixel,
-				 gpointer data)
+static glong
+g_sheet_uniform_row_pixel_to_row (const GSheetRow *geo, guint pixel)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geo);
 
   gint row = pixel / ug->height;
 
-  if (row >= g_sheet_uniform_row_get_row_count(geo, data))
-    row = g_sheet_uniform_row_get_row_count(geo, data) -1;
+  if (row >= g_sheet_uniform_row_get_row_count(geo))
+    row = g_sheet_uniform_row_get_row_count(geo) - 1;
 
   return row;
 }