Removed the visibility predicate from the row/column models.

[pspp-builds.git] / lib / gtksheet / gsheet-uniform-row.c

diff --git a/lib/gtksheet/gsheet-uniform-row.c b/lib/gtksheet/gsheet-uniform-row.c
index 83791adaff055ae29024118d03f87a4547fcda9e..847916c56d863a54edd5c6f79a6cf838a7355714 100644 (file)
--- a/lib/gtksheet/gsheet-uniform-row.c
+++ b/lib/gtksheet/gsheet-uniform-row.c
@@ -90,13 +90,12 @@ g_sheet_uniform_row_new (gint height, gint n_rows)
   ug = G_SHEET_UNIFORM_ROW(retval);
   ug->n_rows = n_rows;
   ug->height = height;
-  ug->is_visible = TRUE;
 
   return retval;
 }
 
 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 +103,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);
 
@@ -112,27 +111,18 @@ 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)
-{
-  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 +149,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;
 }
@@ -193,7 +182,6 @@ g_sheet_row_init (GSheetRowIface *iface)
 {
   iface->get_height = g_sheet_uniform_row_get_height;
   iface->get_sensitivity = g_sheet_uniform_row_get_sensitivity ;
-  iface->get_visibility = g_sheet_uniform_row_get_visibility;
   iface->get_row_count = g_sheet_uniform_row_get_row_count;
   iface->get_button_label = g_sheet_uniform_row_get_button_label;
   iface->top_ypixel = g_sheet_uniform_row_top_ypixel;