X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgtksheet.h;h=4f402252aabfd8473a2d5d31be3f1967ca46ce7e;hb=0d633e38480207a451974f12df3e8615e164e187;hp=b228a1fbb517495644b19d2511085bfaa02b7556;hpb=bdc7b7a618f9426f316cb7d84c0176507dba6fd7;p=pspp-builds.git

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index b228a1fb..4f402252 100644
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -110,9 +110,12 @@ struct _GtkSheetHoverTitle
   gint row, column;
 };
 
-struct _GtkSheet{
+struct _GtkSheet
+{
   GtkContainer container;
 
+
+  gboolean dispose_has_run;
   GSheetColumn *column_geometry;
   GSheetRow *row_geometry;
 
@@ -125,8 +128,6 @@ struct _GtkSheet{
   gboolean autoscroll;
   gboolean justify_entry;
 
-  guint freeze_count;
-
   /* Background colors */
   GdkColor bg_color;
   GdkColor grid_color;
@@ -139,8 +140,6 @@ struct _GtkSheet{
      and the width of the shadow border */
   GdkRectangle internal_allocation;
 
-  gchar *name;
-
   gint16 column_requisition;
   gint16 row_requisition;
 
@@ -149,8 +148,15 @@ struct _GtkSheet{
 
   /* active cell */
   GtkSheetCell active_cell;
-  GtkWidget *sheet_entry;
 
+  /* 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;
 
   /* expanding selection */
@@ -197,6 +203,8 @@ struct _GtkSheet{
   GtkAdjustment *hadjustment;
   GtkAdjustment *vadjustment;
 
+  gint freeze_count;
+
   /* xor GC for the verticle drag line */
   GdkGC *xor_gc;
 
@@ -255,23 +263,8 @@ struct _GtkSheetClass
  gboolean (*activate) 		(GtkSheet *sheet,
 	                	gint row, gint column);
 
- void (*set_cell) 		(GtkSheet *sheet,
-	           		gint row, gint column);
-
- void (*clear_cell) 		(GtkSheet *sheet,
-	           		gint row, gint column);
-
  void (*changed) 		(GtkSheet *sheet,
 	          		gint row, gint column);
-
- void (*new_column_width)       (GtkSheet *sheet,
-                                 gint col,
-                                 guint width);
-
- void (*new_row_height)       	(GtkSheet *sheet,
-                                 gint row,
-                                 guint height);
-
 };
 
 GType gtk_sheet_get_type (void);
@@ -280,7 +273,6 @@ GtkType gtk_sheet_range_get_type (void);
 
 /* create a new sheet */
 GtkWidget * gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo,
-			   const gchar *title,
 			   GSheetModel *model);
 
 
@@ -298,13 +290,11 @@ gtk_sheet_construct_browser		(GtkSheet *sheet,
 GtkWidget *
 gtk_sheet_new_with_custom_entry 	(GSheetRow *vgeo,
 					 GSheetColumn *hgeo,
-                                         const gchar *title,
                                  	 GtkType entry_type);
 void
 gtk_sheet_construct_with_custom_entry	(GtkSheet *sheet,
 					 GSheetRow *vgeo,
 					 GSheetColumn *hgeo,
-                                         const gchar *title,
 					 GtkType entry_type);
 /* change scroll adjustments */
 void
@@ -446,6 +436,11 @@ void
 gtk_sheet_show_row_titles		(GtkSheet *sheet);
 void
 gtk_sheet_hide_row_titles		(GtkSheet *sheet);
+void
+gtk_sheet_show_column_titles		(GtkSheet *sheet);
+void
+gtk_sheet_hide_column_titles		(GtkSheet *sheet);
+
 gboolean
 gtk_sheet_row_titles_visible		(GtkSheet *sheet);