X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgtksheet.h;h=bdb7ea32efeaabd8bc60a96eec0be5d89a18463f;hb=8763a1e6f2dd8030900ea0bcaf0ce22c94e181bd;hp=fa1ac422bee3df8b1724bd95db693717063726a0;hpb=e93857e0338c2a71794db2b57e3659bbe6946240;p=pspp

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index fa1ac422be..bdb7ea32ef 100644
--- 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;
 
@@ -120,10 +118,6 @@ struct _GtkSheet
   /* The GtkEntry used for editing the cells */
   GtkWidget *entry_widget;
 
-  /* The widget containing entry_widget, or
-     entry_widget itself if no container */
-  GtkWidget *entry_container;
-
   /* The type of entry_widget */
   GtkType entry_type;
 
@@ -231,23 +225,16 @@ GtkType gtk_sheet_range_get_type (void);
 
 
 /* create a new sheet */
-GtkWidget * gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo,
-			   GSheetModel *model);
+GtkWidget * gtk_sheet_new (GSheetModel *model);
 
 /* create a new sheet with custom entry */
 GtkWidget *
-gtk_sheet_new_with_custom_entry 	(GSheetRow *vgeo,
-					 GSheetColumn *hgeo,
-                                 	 GtkType entry_type);
-void
-gtk_sheet_construct_with_custom_entry	(GtkSheet *sheet,
-					 GSheetRow *vgeo,
-					 GSheetColumn *hgeo,
-					 GtkType entry_type);
+gtk_sheet_new_with_custom_entry (GtkType entry_type);
+
 /* Change entry */
 void gtk_sheet_change_entry		(GtkSheet *sheet, GtkType entry_type);
 
-GtkWidget *gtk_sheet_get_entry    (GtkSheet *sheet);
+GtkEntry *gtk_sheet_get_entry    (GtkSheet *sheet);
 
 
 void gtk_sheet_get_selected_range (GtkSheet *sheet,