X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgtksheet.h;h=884e41f96b39ca0b3bc5e834ab6a26fc67e45b53;hb=ebfc3d13efe5b2dfb975dd5b4a1b9187f2934f0e;hp=de308a60ebe630b11f5cf5c9c394d116f1db61dd;hpb=11706f97dd318697e43e6468b130ca5b7f1bff87;p=pspp-builds.git

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index de308a60..884e41f9 100644
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -30,7 +30,6 @@
 
 #include "gtkextra-sheet.h"
 #include "gsheetmodel.h"
-#include "gsheet-row-iface.h"
 #include "psppire-axis.h"
 
 G_BEGIN_DECLS
@@ -63,12 +62,10 @@ 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 _GtkSheetHoverTitle
@@ -90,11 +87,8 @@ struct _GtkSheet
   GtkBin parent;
 
   gboolean dispose_has_run;
-  /* 
-  GSheetColumn *column_geometry;
-  */
   PsppireAxis *haxis;
-  GSheetRow *row_geometry;
+  PsppireAxis *vaxis;
 
   guint16 flags;
 
@@ -106,26 +100,15 @@ 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;
 
@@ -233,23 +216,16 @@ GtkType gtk_sheet_range_get_type (void);
 
 
 /* create a new sheet */
-GtkWidget * gtk_sheet_new (GSheetRow *vgeo, void *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,
-					 void *hgeo,
-                                 	 GtkType entry_type);
-void
-gtk_sheet_construct_with_custom_entry	(GtkSheet *sheet,
-					 GSheetRow *vgeo,
-					 void *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,