X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgsheet-column-iface.c;h=c2fc1758f8c9c84d7eaf205a2cce223a0b140a63;hb=c5bf90ff8baa7a81274421acb24a915c953e560f;hp=ca5bd5b6510e954103395ea83d440e32498eb73c;hpb=a1b98c15156a32b058294ba4f5c54fb745550222;p=pspp-builds.git diff --git a/lib/gtksheet/gsheet-column-iface.c b/lib/gtksheet/gsheet-column-iface.c index ca5bd5b6..c2fc1758 100644 --- 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) @@ -254,16 +238,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 +260,3 @@ g_sheet_column_columns_changed (GSheetColumn *geo, first, n_columns); } - - -