Rename gsheetmodel to psppiresheetmodel

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

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index 884e41f96b39ca0b3bc5e834ab6a26fc67e45b53..bdefc41bbb8db83c1b7cdf3ad43ee149f712659c 100644 (file)
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 
 #include "gtkextra-sheet.h"
-#include "gsheetmodel.h"
+#include "psppire-sheetmodel.h"
 #include "psppire-axis.h"
 
 G_BEGIN_DECLS
@@ -92,7 +92,7 @@ struct _GtkSheet
 
   guint16 flags;
 
-  GSheetModel *model;
+  PsppireSheetModel *model;
 
   GtkSelectionMode selection_mode;
 
@@ -100,9 +100,6 @@ struct _GtkSheet
   GdkColor color[n_COLORS];
   gboolean show_grid;
 
-  gint16 column_requisition;
-  gint16 row_requisition;
-
   /* active cell */
   GtkSheetCell active_cell;
 
@@ -112,9 +109,6 @@ struct _GtkSheet
   /* The type of entry_widget */
   GtkType entry_type;
 
-  /* Handler of the "changed" callback for the entry widget */
-  glong entry_handler_id;
-
   /* expanding selection */
   GtkSheetCell selection_cell;
 
@@ -176,13 +170,15 @@ struct _GtkSheet
   /* Used for the subtitle (popups) */
   gint motion_timer;
   GtkSheetHoverTitle *hover_window;
+
+  gulong update_handler_id;
 };
 
 struct _GtkSheetClass
 {
   GtkBinClass parent_class;
 
- void (*set_scroll_adjustments) (GtkSheet *sheet,
+ gboolean (*set_scroll_adjustments) (GtkSheet *sheet,
                                 GtkAdjustment *hadjustment,
                                 GtkAdjustment *vadjustment);
 
@@ -216,7 +212,7 @@ GtkType gtk_sheet_range_get_type (void);
 
 
 /* create a new sheet */
-GtkWidget * gtk_sheet_new (GSheetModel *model);
+GtkWidget * gtk_sheet_new (PsppireSheetModel *model);
 
 /* create a new sheet with custom entry */
 GtkWidget *
@@ -292,9 +288,9 @@ gboolean gtk_sheet_get_attributes       (const GtkSheet *sheet,
                                        GtkSheetCellAttr *attributes);
 
 void gtk_sheet_set_model (GtkSheet *sheet,
-                                  GSheetModel *model);
+                                  PsppireSheetModel *model);
 
-GSheetModel * gtk_sheet_get_model (const GtkSheet *sheet);
+PsppireSheetModel * gtk_sheet_get_model (const GtkSheet *sheet);
 
 
 G_END_DECLS