Prevent updates to the model from feeding back to the current sheet

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

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index f400b107c66485b0920cdee8003ad9d46930b592..d4d00d50e535aa41b779d4919bf082249bb1574f 100644 (file)
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -62,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
@@ -102,16 +100,6 @@ 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;
 
@@ -121,9 +109,6 @@ struct _GtkSheet
   /* 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;
 
@@ -185,6 +170,8 @@ struct _GtkSheet
   /* Used for the subtitle (popups) */
   gint motion_timer;
   GtkSheetHoverTitle *hover_window;
+
+  gulong update_handler_id;
 };
 
 struct _GtkSheetClass
@@ -234,7 +221,7 @@ 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,