G_BEGIN_DECLS
-/* sheet->state */
+/* sheet->select_status */
enum
{
PSPPIRE_SHEET_NORMAL,
#define PSPPIRE_TYPE_SHEET_RANGE (psppire_sheet_range_get_type ())
#define PSPPIRE_TYPE_SHEET_CELL (psppire_sheet_cell_get_type ())
-#define PSPPIRE_TYPE_SHEET (psppire_sheet_get_type ())
-#define PSPPIRE_SHEET(obj) GTK_CHECK_CAST (obj, psppire_sheet_get_type (), PsppireSheet)
-#define PSPPIRE_SHEET_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, psppire_sheet_get_type (), PsppireSheetClass)
-#define PSPPIRE_IS_SHEET(obj) GTK_CHECK_TYPE (obj, psppire_sheet_get_type ())
+
+#define PSPPIRE_TYPE_SHEET (psppire_sheet_get_type ())
+#define PSPPIRE_SHEET(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_TYPE_SHEET, PsppireSheet)
+#define PSPPIRE_SHEET_CLASS(klass) G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_TYPE_SHEET, PsppireSheetClass)
+#define PSPPIRE_IS_SHEET(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_TYPE_SHEET)
typedef struct _PsppireSheetClass PsppireSheetClass;
PsppireSheetModel *model;
- GtkSelectionMode selection_mode;
-
/* Component colors */
GdkColor color[n_COLORS];
gboolean show_grid;
GtkWidget *entry_widget;
/* The type of entry_widget */
- GtkType entry_type;
-
- /* expanding selection */
- PsppireSheetCell selection_cell;
+ GType entry_type;
/* 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;
};
GType psppire_sheet_get_type (void);
-GtkType psppire_sheet_range_get_type (void);
+GType psppire_sheet_range_get_type (void);
/* create a new sheet */
/* create a new sheet with custom entry */
GtkWidget *
-psppire_sheet_new_with_custom_entry (GtkType entry_type);
+psppire_sheet_new_with_custom_entry (GType entry_type);
/* Change entry */
-void psppire_sheet_change_entry (PsppireSheet *sheet, GtkType entry_type);
+void psppire_sheet_change_entry (PsppireSheet *sheet, GType entry_type);
GtkEntry *psppire_sheet_get_entry (PsppireSheet *sheet);