X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgtksheet.h;h=884e41f96b39ca0b3bc5e834ab6a26fc67e45b53;hb=be5dc743c6dca9293d3559b27e74c83bec57eaa7;hp=4b6da2f68f9bff63d1f655bea25ebc8a40d54a07;hpb=9909ba1908eb9485aff7e6da15de84de0ee4a504;p=pspp-builds.git

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index 4b6da2f6..884e41f9 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
 
@@ -47,6 +45,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,28 +55,19 @@ enum
 
 typedef struct _GtkSheetClass GtkSheetClass;
 typedef struct _GtkSheetCellAttr     GtkSheetCellAttr;
-typedef struct _GtkSheetCell GtkSheetCell;
+
 typedef struct _GtkSheetHoverTitle GtkSheetHoverTitle;
 
 
 struct _GtkSheetCellAttr
 {
   GtkJustification justification;
-  const PangoFontDescription *font_desc;
   GdkColor foreground;
   GdkColor background;
   GtkSheetCellBorder border;
   gboolean is_editable;
-  gboolean is_visible;
-};
-
-struct _GtkSheetCell
-{
-  gint row;
-  gint col;
 };
 
-
 struct _GtkSheetHoverTitle
 {
   GtkWidget *window;
@@ -97,8 +87,8 @@ struct _GtkSheet
   GtkBin parent;
 
   gboolean dispose_has_run;
-  GSheetColumn *column_geometry;
-  GSheetRow *row_geometry;
+  PsppireAxis *haxis;
+  PsppireAxis *vaxis;
 
   guint16 flags;
 
@@ -110,29 +100,21 @@ struct _GtkSheet
   GdkColor color[n_COLORS];
   gboolean show_grid;
 
-  /* allocation rectangle after the container_border_width
-     and the width of the shadow border */
-  GdkRectangle internal_allocation;
-
   gint16 column_requisition;
   gint16 row_requisition;
 
-  gboolean rows_resizable;
-  gboolean columns_resizable;
-
   /* active cell */
   GtkSheetCell active_cell;
 
   /* 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;
 
+  /* Handler of the "changed" callback for the entry widget */
+  glong entry_handler_id;
+
   /* expanding selection */
   GtkSheetCell selection_cell;
 
@@ -222,9 +204,6 @@ struct _GtkSheetClass
                          	gint row, gint column,
                          	gint *new_row, gint *new_column);
 
- gboolean (*deactivate)	 	(GtkSheet *sheet,
-	                  	gint row, gint column);
-
  gboolean (*activate) 		(GtkSheet *sheet,
 	                	gint row, gint column);
 
@@ -237,23 +216,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,