Remove font information from cell attributes and sheet model.

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

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index d79ebac29f54cbefc8b001114471d0f837f8e311..92c4248eff1c6fb42f6974db8103e6a30aa32a86 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,10 +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;
 
@@ -118,10 +112,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;
 
@@ -238,7 +228,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,