Remove the gsheet-row-* modules and replaced with psppire-axis-*

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

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index fa1ac422bee3df8b1724bd95db693717063726a0..ba2294f84bedbbf28f2352f8da955259a5b4fed2 100644 (file)
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -30,9 +30,7 @@
 
 #include "gtkextra-sheet.h"
 #include "gsheetmodel.h"
-#include "gsheet-column-iface.h"
-#include "gsheet-row-iface.h"
-
+#include "psppire-axis.h"
 
 G_BEGIN_DECLS
 
@@ -91,8 +89,8 @@ struct _GtkSheet
   GtkBin parent;
 
   gboolean dispose_has_run;
-  GSheetColumn *column_geometry;
-  GSheetRow *row_geometry;
+  PsppireAxis *haxis;
+  PsppireAxis *vaxis;
 
   guint16 flags;
 
@@ -231,19 +229,14 @@ GtkType gtk_sheet_range_get_type (void);
 
 
 /* create a new sheet */
-GtkWidget * gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo,
+GtkWidget * gtk_sheet_new (void *vgeo, void *hgeo,
                           GSheetModel *model);
 
 /* create a new sheet with custom entry */
 GtkWidget *
-gtk_sheet_new_with_custom_entry        (GSheetRow *vgeo,
-                                        GSheetColumn *hgeo,
+gtk_sheet_new_with_custom_entry        (void *vgeo,
+                                        void *hgeo,
                                         GtkType entry_type);
-void
-gtk_sheet_construct_with_custom_entry  (GtkSheet *sheet,
-                                        GSheetRow *vgeo,
-                                        GSheetColumn *hgeo,
-                                        GtkType entry_type);
 /* Change entry */
 void gtk_sheet_change_entry            (GtkSheet *sheet, GtkType entry_type);