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 0ad462f9c097bd745eefb35f44e82b3a43166ae4..56dcbca85e45c12c9fedbac5c88223d5e8c90dc6 100644 (file)
--- a/lib/gtksheet/gsheet-column-iface.c
+++ b/lib/gtksheet/gsheet-column-iface.c
@@ -36,12 +36,9 @@ enum {
 
 static guint sheet_column_signals[LAST_SIGNAL];
 
+static void g_sheet_column_base_init (gpointer g_class);
 
-
-static void      g_sheet_column_base_init   (gpointer g_class);
-
-
-inline GType
+GType
 g_sheet_column_get_type (void)
 {
   static GType sheet_column_type = 0;
@@ -66,7 +63,7 @@ g_sheet_column_get_type (void)
        g_type_register_static (G_TYPE_INTERFACE, "GSheetColumn",
                                &sheet_column_info, 0);
 
-      g_assert(sheet_column_type);
+      g_assert (sheet_column_type);
 
       g_type_interface_add_prerequisite (sheet_column_type, G_TYPE_OBJECT);
     }
@@ -100,8 +97,8 @@ g_sheet_column_base_init (gpointer g_class)
 }
 
 
-inline void
-g_sheet_column_set_width (GSheetColumn *column, gint col, gint size)
+void
+g_sheet_column_set_width (GSheetColumn *column, glong col, gint size)
 {
   g_return_if_fail (G_IS_SHEET_COLUMN (column));
 
@@ -110,8 +107,8 @@ g_sheet_column_set_width (GSheetColumn *column, gint col, gint size)
 }
 
 
-inline gint
-g_sheet_column_get_width (const GSheetColumn *column, gint col)
+gint
+g_sheet_column_get_width (const GSheetColumn *column, glong col)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (column), -1);
 
@@ -122,22 +119,9 @@ g_sheet_column_get_width (const GSheetColumn *column, gint col)
 
 
 
-inline gboolean
-g_sheet_column_get_visibility(const GSheetColumn *column,
-                                           gint 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);
-
-}
-
-inline gboolean
-g_sheet_column_get_sensitivity(const GSheetColumn *column,
-                                            gint col)
+gboolean
+g_sheet_column_get_sensitivity (const GSheetColumn *column,
+                                            glong col)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
 
@@ -149,25 +133,25 @@ g_sheet_column_get_sensitivity(const GSheetColumn *column,
 }
 
 
-inline GtkSheetButton *
-g_sheet_column_get_button(const GSheetColumn *column,
-                             gint col)
+GtkSheetButton *
+g_sheet_column_get_button (const GSheetColumn *column,
+                             glong col)
 {
-  GtkSheetButton *button = gtk_sheet_button_new();
+  GtkSheetButton *button = gtk_sheet_button_new ();
 
   GSheetColumnIface *iface = G_SHEET_COLUMN_GET_IFACE (column);
 
   g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
 
   if ( iface->get_button_label)
-    button->label = iface->get_button_label(column, col);
+    button->label = iface->get_button_label (column, col);
 
   return button;
 }
 
-inline GtkJustification
-g_sheet_column_get_justification(const GSheetColumn *column,
-                                    gint col)
+GtkJustification
+g_sheet_column_get_justification (const GSheetColumn *column,
+                                    glong col)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE);
 
@@ -176,8 +160,8 @@ g_sheet_column_get_justification(const GSheetColumn *column,
   return (G_SHEET_COLUMN_GET_IFACE (column)->get_justification) (column, col);
 }
 
-inline gchar *
-g_sheet_column_get_subtitle (const GSheetColumn *column, gint col)
+gchar *
+g_sheet_column_get_subtitle (const GSheetColumn *column, glong col)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (column), NULL);
 
@@ -189,56 +173,8 @@ g_sheet_column_get_subtitle (const GSheetColumn *column, gint col)
 
 
 
-inline gint
-g_sheet_column_get_left_text_column (const GSheetColumn *column,
-                                        gint 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);
-
-}
-
-inline gint
-g_sheet_column_get_right_text_column (const GSheetColumn *column,
-                                         gint 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);
-
-}
-
-inline void
-g_sheet_column_set_left_text_column (const GSheetColumn *column,
-                                        gint 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);
-
-}
-
-
-inline void
-g_sheet_column_set_right_text_column (const GSheetColumn *column,
-                                         gint 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);
-}
-
-inline gint
-g_sheet_column_get_column_count(const GSheetColumn *geo)
+glong
+g_sheet_column_get_column_count (const GSheetColumn *geo)
 {
   g_return_val_if_fail (G_IS_SHEET_COLUMN (geo), -1);
 
@@ -247,31 +183,28 @@ g_sheet_column_get_column_count(const GSheetColumn *geo)
   return (G_SHEET_COLUMN_GET_IFACE (geo)->get_column_count) (geo);
 }
 
-inline gint
-g_sheet_column_start_pixel(const GSheetColumn *geo, gint col)
+gint
+g_sheet_column_start_pixel (const GSheetColumn *geo, glong col)
 {
   gint i;
   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;
-
 }
 
 
 
-inline void
-g_sheet_column_columns_changed(GSheetColumn *geo,
-                                gint first, gint n_columns)
+void
+g_sheet_column_columns_changed (GSheetColumn *geo,
+                                glong first, glong n_columns)
 {
   g_return_if_fail (G_IS_SHEET_COLUMN (geo));
 
@@ -279,6 +212,3 @@ g_sheet_column_columns_changed(GSheetColumn *geo,
                 first, n_columns);
 }
 
-
-
-