X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgsheet-column-iface.h;h=5503393a4be8efcb1949768c694eac162e1ea8b8;hb=b9f6480f1b451cb7873bb0591369504ff1b92595;hp=430814abc3768304a292fd3e8b0abec1662d53b1;hpb=e294a372f351d7105c21a2db58022af8b119aa64;p=pspp-builds.git

diff --git a/lib/gtksheet/gsheet-column-iface.h b/lib/gtksheet/gsheet-column-iface.h
index 430814ab..5503393a 100644
--- a/lib/gtksheet/gsheet-column-iface.h
+++ b/lib/gtksheet/gsheet-column-iface.h
@@ -1,4 +1,4 @@
-/* GSheetColumn --- an abstract model of the column geometry of a 
+/* GSheetColumn --- an abstract model of the column geometry of a
  * GSheet widget.
  * Copyright (C) 2006 Free Software Foundation
  *
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define G_SHEET_COLUMN_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_SHEET_COLUMN, GSheetColumnIface))
 
 
-typedef struct _GSheetColumn        GSheetColumn; 
+typedef struct _GSheetColumn        GSheetColumn;
 typedef struct _GSheetColumnIface   GSheetColumnIface;
 struct _GSheetColumnIface
 {
@@ -44,40 +44,42 @@ struct _GSheetColumnIface
 
   /* Signals */
   void         (* columns_changed)     (GSheetColumn *geo,
-				      gint col, gint n_columns);
+				      glong col, glong n_columns);
 
   /* Virtual Table */
-  gint (* get_width) (const GSheetColumn *gcolumn, gint col, gpointer data);
-  void (* set_width) (GSheetColumn *gcolumn, gint col, gint width, gpointer data);
+  gint (* get_width) (const GSheetColumn *gcolumn, glong col);
+  void (* set_width) (GSheetColumn *gcolumn, glong col, gint width);
 
-  gboolean (* get_visibility) (const GSheetColumn *gcolumn, gint col, gpointer data);
-  gboolean (* get_sensitivity) (const GSheetColumn *gcolumn, gint col, gpointer data);
-  const GtkSheetButton * (* get_button) (const GSheetColumn *gcolumn, gint col, gpointer data);
-  GtkJustification (* get_justification) (const GSheetColumn *gcolumn, gint col, gpointer data);
+  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,
-				 gint col, gpointer data);
+				 glong col);
 
   gint  (*get_right_text_column) (const GSheetColumn *gcolumn,
-				  gint col, gpointer data);
+				  glong col);
 
   void (* set_left_text_column) (const GSheetColumn *gcolumn,
-				 gint col, gint i, gpointer data);
+				 glong col, gint i);
 
   void (* set_right_text_column) (const GSheetColumn *gcolumn,
-				  gint col, gint i, gpointer data);
+				  glong col, gint i);
 
-  gint  (* get_column_count) (const GSheetColumn *geo, gpointer data);
+  glong  (* get_column_count) (const GSheetColumn *geo);
 
 
-  GtkStateType  (*get_button_state)(const GSheetColumn *geo, gint col, gpointer data);
-  gchar * (*get_button_label)(const GSheetColumn *geo, gint col, gpointer data);
-  gboolean      (*get_button_visibility)(const GSheetColumn *geo, 
-					gint col, gpointer data);
-  const GtkSheetChild * (*get_button_child)(const GSheetColumn *geo, 
-					   gint col, gpointer data);
-  GtkJustification * (*get_button_justification)(const GSheetColumn *geo, 
-						gint col, gpointer data);
+  GtkStateType  (*get_button_state)(const GSheetColumn *geo, glong col);
+  gchar * (*get_button_label)(const GSheetColumn *geo, glong col);
+  gchar * (*get_subtitle)(const GSheetColumn *geo, glong col);
+
+  gboolean      (*get_button_visibility)(const GSheetColumn *geo,
+					glong col);
+  const GtkSheetChild * (*get_button_child)(const GSheetColumn *geo,
+					   glong col);
+  GtkJustification * (*get_button_justification)(const GSheetColumn *geo,
+						glong col);
 };
 
 
@@ -85,46 +87,48 @@ inline GType g_sheet_column_get_type   (void) G_GNUC_CONST;
 
 
 inline gint  g_sheet_column_get_width (const GSheetColumn *gcolumn,
-				       gint col, gpointer data);
+				       glong col);
 
 
 inline void  g_sheet_column_set_width (GSheetColumn *gcolumn,
-				       gint col, gint size, gpointer data);
+				       glong col, gint size);
+
 
+inline gboolean  g_sheet_column_get_visibility (const GSheetColumn *gcolumn,
+					    glong col);
 
-inline gboolean  g_sheet_column_get_visibility(const GSheetColumn *gcolumn,
-					    gint col, gpointer data);
+inline gboolean  g_sheet_column_get_sensitivity (const GSheetColumn *gcolumn,
+					     glong col);
 
-inline gboolean  g_sheet_column_get_sensitivity(const GSheetColumn *gcolumn,
-					     gint col, gpointer data);
 
+inline GtkSheetButton *g_sheet_column_get_button (const GSheetColumn *gcolumn,
+					     glong col);
 
-inline GtkSheetButton *g_sheet_column_get_button(const GSheetColumn *gcolumn,
-					     gint col, gpointer data);
+gchar *g_sheet_column_get_subtitle (const GSheetColumn *, glong);
 
-inline GtkJustification g_sheet_column_get_justification(const GSheetColumn *gcolumn, gint col, gpointer data);
+inline GtkJustification g_sheet_column_get_justification (const GSheetColumn *gcolumn, glong col);
 
 
 inline gint  g_sheet_column_get_left_text_column (const GSheetColumn *gcolumn,
-					gint col, gpointer data);
+					glong col);
 
 inline gint  g_sheet_column_get_right_text_column (const GSheetColumn *gcolumn,
-					gint col, gpointer data);
+					glong col);
 
 inline void g_sheet_column_set_left_text_column (const GSheetColumn *gcolumn,
-					gint col, gint i, gpointer data);
+					glong col, gint i);
 
 
 inline void g_sheet_column_set_right_text_column (const GSheetColumn *gcolumn,
-					gint col, gint i, gpointer data);
+					glong col, gint i);
 
 
-inline gint  g_sheet_column_get_column_count(const GSheetColumn *geo, gpointer data);
+inline glong  g_sheet_column_get_column_count (const GSheetColumn *geo);
 
-inline gint  g_sheet_column_start_pixel(const GSheetColumn *geo, gint col, gpointer data);
+inline gint  g_sheet_column_start_pixel (const GSheetColumn *geo, glong col);
 
-inline void g_sheet_column_columns_changed(GSheetColumn *geo, 
-					   gint first, gint n_columns);
+inline void g_sheet_column_columns_changed (GSheetColumn *geo,
+					   glong first, glong n_columns);
 
 G_END_DECLS