X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgsheetmodel.h;h=6a54d7e85ab25a72abf8815548e5bec4c9bb910b;hb=8e1c2cfa5b318adc5a536d233ad54cd5a3fd8310;hp=43583eb3f01c43fb8a0ae2d04e7651007614d17b;hpb=806d578c678996f8c6e34d8d91331126eedb22ac;p=pspp-builds.git

diff --git a/lib/gtksheet/gsheetmodel.h b/lib/gtksheet/gsheetmodel.h
index 43583eb3..6a54d7e8 100644
--- a/lib/gtksheet/gsheetmodel.h
+++ b/lib/gtksheet/gsheetmodel.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-
+#include "gtkextra-sheet.h"
 
 G_BEGIN_DECLS
 
@@ -51,8 +51,8 @@ typedef struct _GtkSheetCellBorder     GtkSheetCellBorder;
 
 struct _GtkSheetRange
 {
-  glong row0,col0; /* upper-left cell */
-  glong rowi,coli; /* lower-right cell */
+  gint row0, col0; /* upper-left cell */
+  gint rowi, coli; /* lower-right cell */
 };
 
 struct _GtkSheetCellBorder
@@ -93,6 +93,8 @@ struct _GSheetModelIface
 
 
 
+
+
   /* Virtual Table */
 
   gchar *      (* get_string)      (const GSheetModel *sheet_model,
@@ -104,7 +106,6 @@ struct _GSheetModelIface
   gboolean  (* clear_datum) (GSheetModel *sheet_model,
 			     glong row, glong column);
 
-  gboolean (* is_visible) (const GSheetModel *sheet_model, glong row, glong column);
   gboolean (* is_editable) (const GSheetModel *sheet_model, glong row, glong column);
 
   GdkColor *  (* get_foreground) (const GSheetModel *sheet_model,
@@ -116,17 +117,22 @@ struct _GSheetModelIface
   const GtkJustification *  (* get_justification) (const GSheetModel *sheet_model,
 						   glong row, glong column);
 
-  const PangoFontDescription *  (* get_font_desc) (const GSheetModel *sheet_model,
-						   glong row, glong column);
-
-  const GtkSheetCellBorder *  (* get_cell_border) (const GSheetModel *sheet_model,
-						   glong row, glong column);
+  /* column related metadata */
 
+  gchar * (*get_column_title) (const GSheetModel *, gint col);
+  gchar * (*get_column_subtitle) (const GSheetModel *, gint col);
+  gboolean (*get_column_sensitivity) (const GSheetModel *, gint col);
+  GtkJustification (*get_column_justification) (const GSheetModel *mode, gint col);
+  const GtkSheetButton * (* get_button) (const GSheetModel *model, gint col);
 
   glong (*get_column_count) (const GSheetModel *model);
 
-  glong (*get_row_count) (const GSheetModel *model);
 
+  /* row related metadata */
+  gchar * (*get_row_title) (const GSheetModel *, gint row);
+  gchar * (*get_row_subtitle) (const GSheetModel *, gint row);
+  glong (*get_row_count) (const GSheetModel *model);
+  gboolean (*get_row_sensitivity) (const GSheetModel *, gint row);
 };
 
 
@@ -175,14 +181,9 @@ GdkColor *g_sheet_model_get_foreground
 GdkColor *g_sheet_model_get_background
  (const GSheetModel *model, glong row, glong column);
 
-
 const GtkJustification *g_sheet_model_get_justification
  (const GSheetModel *model, glong row, glong column);
 
-
-const PangoFontDescription *g_sheet_model_get_font_desc
- (const GSheetModel *model, glong row, glong column);
-
 const GtkSheetCellBorder * g_sheet_model_get_cell_border
  (const GSheetModel *model, glong row, glong column);
 
@@ -192,6 +193,34 @@ glong g_sheet_model_get_column_count (const GSheetModel *sheet_model);
 
 gint g_sheet_model_get_row_count (const GSheetModel *sheet_model);
 
+
+
+gboolean g_sheet_model_get_column_sensitivity (const GSheetModel *model,
+					       gint col);
+
+gchar * g_sheet_model_get_column_subtitle (const GSheetModel *model,
+					    gint col);
+
+GtkSheetButton * g_sheet_model_get_column_button (const GSheetModel *, gint);
+
+GtkJustification g_sheet_model_get_column_justification (const GSheetModel *,
+							 gint);
+
+
+
+gboolean g_sheet_model_get_row_sensitivity (const GSheetModel *model,
+					    gint row);
+
+
+gchar * g_sheet_model_get_row_subtitle (const GSheetModel *model,
+					    gint row);
+
+
+GtkSheetButton * g_sheet_model_get_row_button (const GSheetModel *, gint);
+
+
+
+
 G_END_DECLS
 
 #endif /* __G_SHEET_MODEL_H__ */