Ben's patches to tower.[ch]

[pspp-builds.git] / lib / gtksheet / gsheet-column-iface.c

diff --git a/lib/gtksheet/gsheet-column-iface.c b/lib/gtksheet/gsheet-column-iface.c
index ca5bd5b6510e954103395ea83d440e32498eb73c..56dcbca85e45c12c9fedbac5c88223d5e8c90dc6 100644 (file)
--- a/lib/gtksheet/gsheet-column-iface.c
+++ b/lib/gtksheet/gsheet-column-iface.c
@@ -36,11 +36,8 @@ enum {
 
 static guint sheet_column_signals[LAST_SIGNAL];
 
-
-
 static void g_sheet_column_base_init (gpointer g_class);
 
-
 GType
 g_sheet_column_get_type (void)
 {
@@ -122,19 +119,6 @@ g_sheet_column_get_width (const GSheetColumn *column, glong col)
 
 
 
-gboolean
-g_sheet_column_get_visibility (const GSheetColumn *column,
-                                           glong col)
-{
-  g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
-
-  g_assert (G_SHEET_COLUMN_GET_IFACE (column)->get_visibility);
-
-  return (G_SHEET_COLUMN_GET_IFACE (column)->get_visibility) (column,
-                                                                 col);
-
-}
-
 gboolean
 g_sheet_column_get_sensitivity (const GSheetColumn *column,
                                             glong col)
@@ -189,54 +173,6 @@ g_sheet_column_get_subtitle (const GSheetColumn *column, glong col)
 
 
 
-gint
-g_sheet_column_get_left_text_column (const GSheetColumn *column,
-                                        glong col)
-{
-  g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
-
-  if  ( ! G_SHEET_COLUMN_GET_IFACE (column)->get_left_text_column)
-    return col;
-
-  return (G_SHEET_COLUMN_GET_IFACE (column)->get_left_text_column) (column, col);
-
-}
-
-gint
-g_sheet_column_get_right_text_column (const GSheetColumn *column,
-                                         glong col)
-{
-  g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
-
-  if  ( ! G_SHEET_COLUMN_GET_IFACE (column)->get_right_text_column)
-    return col;
-
-  return (G_SHEET_COLUMN_GET_IFACE (column)->get_right_text_column) (column, col);
-
-}
-
-void
-g_sheet_column_set_left_text_column (const GSheetColumn *column,
-                                        glong col, gint i)
-{
-  g_return_if_fail (G_IS_SHEET_COLUMN (column));
-
-  if  ( G_SHEET_COLUMN_GET_IFACE (column)->set_left_text_column)
-    (G_SHEET_COLUMN_GET_IFACE (column)->set_left_text_column) (column, col, i);
-
-}
-
-
-void
-g_sheet_column_set_right_text_column (const GSheetColumn *column,
-                                         glong col, gint i)
-{
-  g_return_if_fail (G_IS_SHEET_COLUMN (column));
-
-  if  ( G_SHEET_COLUMN_GET_IFACE (column)->set_right_text_column)
-    (G_SHEET_COLUMN_GET_IFACE (column)->set_right_text_column) (column, col, i);
-}
-
 glong
 g_sheet_column_get_column_count (const GSheetColumn *geo)
 {
@@ -254,16 +190,14 @@ g_sheet_column_start_pixel (const GSheetColumn *geo, glong col)
   gint start_pixel = 0;
 
   g_return_val_if_fail (G_IS_SHEET_COLUMN (geo), -1);
-  g_return_val_if_fail (col < g_sheet_column_get_column_count (geo), -1);
+  g_return_val_if_fail (col <= g_sheet_column_get_column_count (geo), -1);
 
-  for ( i = 0 ; i < col ; ++i )
+  for (i = 0; i < col; ++i)
     {
-      if ( g_sheet_column_get_visibility (geo, i))
-       start_pixel += g_sheet_column_get_width (geo, i);
+      start_pixel += g_sheet_column_get_width (geo, i);
     }
 
   return start_pixel;
-
 }
 
 
@@ -278,6 +212,3 @@ g_sheet_column_columns_changed (GSheetColumn *geo,
                 first, n_columns);
 }
 
-
-
-