Replace gsheet-column interface by psppire-axis

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

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index e039874c521a5a202d228bbaa1717cc25a5b5370..de308a60ebe630b11f5cf5c9c394d116f1db61dd 100644 (file)
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -30,9 +30,8 @@
 
 #include "gtkextra-sheet.h"
 #include "gsheetmodel.h"
-#include "gsheet-column-iface.h"
 #include "gsheet-row-iface.h"
-
+#include "psppire-axis.h"
 
 G_BEGIN_DECLS
 
@@ -47,6 +46,7 @@ enum
 
 
 #define GTK_TYPE_SHEET_RANGE (gtk_sheet_range_get_type ())
+#define GTK_TYPE_SHEET_CELL (gtk_sheet_cell_get_type ())
 #define GTK_TYPE_SHEET (gtk_sheet_get_type ())
 
 #define GTK_SHEET(obj)          GTK_CHECK_CAST (obj, gtk_sheet_get_type (), GtkSheet)
@@ -56,7 +56,7 @@ enum
 
 typedef struct _GtkSheetClass GtkSheetClass;
 typedef struct _GtkSheetCellAttr     GtkSheetCellAttr;
-typedef struct _GtkSheetCell GtkSheetCell;
+
 typedef struct _GtkSheetHoverTitle GtkSheetHoverTitle;
 
 
@@ -71,13 +71,6 @@ struct _GtkSheetCellAttr
   gboolean is_visible;
 };
 
-struct _GtkSheetCell
-{
-  gint row;
-  gint col;
-};
-
-
 struct _GtkSheetHoverTitle
 {
   GtkWidget *window;
@@ -97,7 +90,10 @@ struct _GtkSheet
   GtkBin parent;
 
   gboolean dispose_has_run;
+  /* 
   GSheetColumn *column_geometry;
+  */
+  PsppireAxis *haxis;
   GSheetRow *row_geometry;
 
   guint16 flags;
@@ -133,6 +129,9 @@ 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;
 
@@ -234,18 +233,18 @@ GtkType gtk_sheet_range_get_type (void);
 
 
 /* create a new sheet */
-GtkWidget * gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo,
+GtkWidget * gtk_sheet_new (GSheetRow *vgeo, void *hgeo,
                           GSheetModel *model);
 
 /* create a new sheet with custom entry */
 GtkWidget *
 gtk_sheet_new_with_custom_entry        (GSheetRow *vgeo,
-                                        GSheetColumn *hgeo,
+                                        void *hgeo,
                                         GtkType entry_type);
 void
 gtk_sheet_construct_with_custom_entry  (GtkSheet *sheet,
                                         GSheetRow *vgeo,
-                                        GSheetColumn *hgeo,
+                                        void *hgeo,
                                         GtkType entry_type);
 /* Change entry */
 void gtk_sheet_change_entry            (GtkSheet *sheet, GtkType entry_type);