Merge commit 'HEAD'; branch 'rewrite-sheet'

[pspp-builds.git] / lib / gtksheet / gsheetmodel.h

diff --git a/lib/gtksheet/gsheetmodel.h b/lib/gtksheet/gsheetmodel.h
index 792e6921ecc3637711bb89a285ee3af5670abb80..6a54d7e85ab25a72abf8815548e5bec4c9bb910b 100644 (file)
--- a/lib/gtksheet/gsheetmodel.h
+++ b/lib/gtksheet/gsheetmodel.h
@@ -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
@@ -106,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,
@@ -118,14 +117,6 @@ 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);
@@ -190,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);