X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtk-contrib%2Fpsppire-sheet.h;h=db58d4bdf3ea4429dcc35637cc61df28d089ab5f;hb=db0ab43d34135721e7e82ba62d413681e462f801;hp=82de87bed5659a21088ab347ce10d799278c2574;hpb=8af88c0b7ea2fe75df7e45497988ed0371006a86;p=pspp-builds.git

diff --git a/lib/gtk-contrib/psppire-sheet.h b/lib/gtk-contrib/psppire-sheet.h
index 82de87be..db58d4bd 100644
--- a/lib/gtk-contrib/psppire-sheet.h
+++ b/lib/gtk-contrib/psppire-sheet.h
@@ -53,7 +53,7 @@
 
 G_BEGIN_DECLS
 
-/* sheet->state */
+/* sheet->select_status */
 enum
 {
   PSPPIRE_SHEET_NORMAL,
@@ -84,7 +84,6 @@ struct _PsppireSheetCellAttr
   GdkColor foreground;
   GdkColor background;
   PsppireSheetCellBorder border;
-  gboolean is_editable;
 };
 
 struct _PsppireSheetHoverTitle
@@ -113,8 +112,6 @@ struct _PsppireSheet
 
   PsppireSheetModel *model;
 
-  GtkSelectionMode selection_mode;
-
   /* Component colors */
   GdkColor color[n_COLORS];
   gboolean show_grid;
@@ -128,18 +125,18 @@ struct _PsppireSheet
   /* The type of entry_widget */
   GtkType entry_type;
 
-  /* expanding selection */
-  PsppireSheetCell selection_cell;
-
   /* global selection button */
   GtkWidget *button;
 
   /* sheet state */
-  gint state;
+  gint select_status;
 
   /* selected range */
   PsppireSheetRange range;
 
+  /* The space between a cell's contents and its border */
+  GtkBorder *cell_padding;
+
   /* the scrolling window and its height and width to
    * make things a little speedier */
   GdkWindow *sheet_window;
@@ -300,12 +297,6 @@ void psppire_sheet_get_active_cell (PsppireSheet *sheet,
 gchar *psppire_sheet_cell_get_text (const PsppireSheet *sheet, gint row, gint col);
 
 
-/* get cell attributes of the given cell */
-/* TRUE means that the cell is currently allocated */
-gboolean psppire_sheet_get_attributes       (const PsppireSheet *sheet,
-					gint row, gint col,
-					PsppireSheetCellAttr *attributes);
-
 void psppire_sheet_set_model (PsppireSheet *sheet,
 				   PsppireSheetModel *model);