Ben's patches to tower.[ch]

[pspp] / lib / gtksheet / gsheet-column-iface.h

diff --git a/lib/gtksheet/gsheet-column-iface.h b/lib/gtksheet/gsheet-column-iface.h
index 4ad1d3fcfc0a9b0b787b643686e74da54a16cdb0..34ccbf2101ed8554c36c87f2790e26d551d5dc37 100644 (file)
--- a/lib/gtksheet/gsheet-column-iface.h
+++ b/lib/gtksheet/gsheet-column-iface.h
@@ -44,29 +44,16 @@ struct _GSheetColumnIface
 
   /* Signals */
   void         (* columns_changed)     (GSheetColumn *geo,
-                                     glong col, glong n_columns);
+                                       glong col, glong n_columns);
 
   /* Virtual Table */
   gint (* get_width) (const GSheetColumn *gcolumn, glong col);
   void (* set_width) (GSheetColumn *gcolumn, glong col, gint width);
 
-  gboolean (* get_visibility) (const GSheetColumn *gcolumn, glong col);
   gboolean (* get_sensitivity) (const GSheetColumn *gcolumn, glong col);
   const GtkSheetButton * (* get_button) (const GSheetColumn *gcolumn, glong col);
   GtkJustification (* get_justification) (const GSheetColumn *gcolumn, glong col);
 
-  gint  (*get_left_text_column) (const GSheetColumn *gcolumn,
-                                glong col);
-
-  gint  (*get_right_text_column) (const GSheetColumn *gcolumn,
-                                 glong col);
-
-  void (* set_left_text_column) (const GSheetColumn *gcolumn,
-                                glong col, gint i);
-
-  void (* set_right_text_column) (const GSheetColumn *gcolumn,
-                                 glong col, gint i);
-
   glong  (* get_column_count) (const GSheetColumn *geo);
 
 
@@ -75,59 +62,42 @@ struct _GSheetColumnIface
   gchar * (*get_subtitle)(const GSheetColumn *geo, glong col);
 
   gboolean      (*get_button_visibility)(const GSheetColumn *geo,
-                                       glong col);
+                                        glong col);
 
   GtkJustification * (*get_button_justification)(const GSheetColumn *geo,
-                                               glong col);
+                                                glong col);
 };
 
 
-inline GType g_sheet_column_get_type   (void) G_GNUC_CONST;
-
+GType g_sheet_column_get_type   (void) G_GNUC_CONST;
 
-inline gint  g_sheet_column_get_width (const GSheetColumn *gcolumn,
-                                      glong col);
 
+gint  g_sheet_column_get_width (const GSheetColumn *gcolumn,
+                               glong col);
 
-inline void  g_sheet_column_set_width (GSheetColumn *gcolumn,
-                                      glong col, gint size);
 
+void  g_sheet_column_set_width (GSheetColumn *gcolumn,
+                               glong col, gint size);
 
-inline gboolean  g_sheet_column_get_visibility (const GSheetColumn *gcolumn,
-                                           glong col);
 
-inline gboolean  g_sheet_column_get_sensitivity (const GSheetColumn *gcolumn,
-                                            glong col);
+gboolean  g_sheet_column_get_sensitivity (const GSheetColumn *gcolumn,
+                                         glong col);
 
 
-inline GtkSheetButton *g_sheet_column_get_button (const GSheetColumn *gcolumn,
-                                            glong col);
+GtkSheetButton *g_sheet_column_get_button (const GSheetColumn *gcolumn,
+                                          glong col);
 
 gchar *g_sheet_column_get_subtitle (const GSheetColumn *, glong);
 
-inline GtkJustification g_sheet_column_get_justification (const GSheetColumn *gcolumn, glong col);
-
-
-inline gint  g_sheet_column_get_left_text_column (const GSheetColumn *gcolumn,
-                                       glong col);
-
-inline gint  g_sheet_column_get_right_text_column (const GSheetColumn *gcolumn,
-                                       glong col);
-
-inline void g_sheet_column_set_left_text_column (const GSheetColumn *gcolumn,
-                                       glong col, gint i);
-
-
-inline void g_sheet_column_set_right_text_column (const GSheetColumn *gcolumn,
-                                       glong col, gint i);
+GtkJustification g_sheet_column_get_justification (const GSheetColumn *gcolumn, glong col);
 
 
-inline glong  g_sheet_column_get_column_count (const GSheetColumn *geo);
+glong  g_sheet_column_get_column_count (const GSheetColumn *geo);
 
-inline gint  g_sheet_column_start_pixel (const GSheetColumn *geo, glong col);
+gint  g_sheet_column_start_pixel (const GSheetColumn *geo, glong col);
 
-inline void g_sheet_column_columns_changed (GSheetColumn *geo,
-                                          glong first, glong n_columns);
+void g_sheet_column_columns_changed (GSheetColumn *geo,
+                                    glong first, glong n_columns);
 
 G_END_DECLS