Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...

Conflicts:

	src/ui/gui/psppire-var-store.h

diff --combined src/ui/gui/psppire-var-store.c
index 4465fa1dda4cab6aac70eee1f4bbbc5c9219911f,904ac39d1fa05aef3af70aa2671170204daa2bb3..083bffad9e8be57a5a087ddbe973396c9a495a1c
--- 1/src/ui/gui/psppire-var-store.c
--- 2/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@@ -43,7 -43,7 +43,7 @@@
  
  enum
    {
 -    PSPPIRE_VAR_STORE_TRAILING_ROWS = 1,
 +    PROP_0,
      PSPPIRE_VAR_STORE_FORMAT_TYPE
    };
  
@@@ -143,6 -143,10 +143,6 @@@ psppire_var_store_set_property (GObjec
  
    switch (property_id)
      {
 -    case PSPPIRE_VAR_STORE_TRAILING_ROWS:
 -      self->trailing_rows = g_value_get_int (value);
 -      break;
 -
      case PSPPIRE_VAR_STORE_FORMAT_TYPE:
        self->format_type = g_value_get_enum (value);
        break;
@@@ -163,6 -167,10 +163,6 @@@ psppire_var_store_get_property (GObjec
  
    switch (property_id)
      {
 -    case PSPPIRE_VAR_STORE_TRAILING_ROWS:
 -      g_value_set_int (value, self->trailing_rows);
 -      break;
 -
      case PSPPIRE_VAR_STORE_FORMAT_TYPE:
        g_value_set_enum (value, self->format_type);
        break;
@@@ -187,6 -195,20 +187,6 @@@ psppire_var_store_class_init (PsppireVa
    object_class->set_property = psppire_var_store_set_property;
    object_class->get_property = psppire_var_store_get_property;
  
 -  /* The minimum value for trailing-rows is 1 to prevent the
 -     var-store from ever having 0 rows, which breaks invariants
 -     in gtksheet. */
 -  pspec = g_param_spec_int ("trailing-rows",
 -                            "Trailing rows",
 -                            "Number of rows displayed after last variable",
 -                            1  /* minimum value */,
 -                            100 /* maximum value */,
 -                            40  /* default value */,
 -                            G_PARAM_READWRITE);
 -  g_object_class_install_property (object_class,
 -                                   PSPPIRE_VAR_STORE_TRAILING_ROWS,
 -                                   pspec);
 -
    pspec = g_param_spec_enum ("format-type",
                               "Variable format type",
                               ("Whether variables have input or output "
@@@ -194,7 -216,6 +194,7 @@@
                               G_TYPE_PSPPIRE_VAR_STORE_FORMAT_TYPE,
                               PSPPIRE_VAR_STORE_OUTPUT_FORMATS,
                               G_PARAM_READWRITE);
 +
    g_object_class_install_property (object_class,
                                     PSPPIRE_VAR_STORE_FORMAT_TYPE,
                                     pspec);
@@@ -209,6 -230,7 +209,6 @@@ psppire_var_store_init (PsppireVarStor
        g_critical ("Could not parse color \"%s\"", DISABLED_COLOR);
  
    var_store->dict = 0;
 -  var_store->trailing_rows = 40;
    var_store->format_type = PSPPIRE_VAR_STORE_OUTPUT_FORMATS;
  }
  
@@@ -279,15 -301,6 +279,6 @@@ psppire_var_store_get_foreground (cons
  }
  
  
- const PangoFontDescription *
- psppire_var_store_get_font_desc (const GSheetModel *model,
-                             glong row, glong column)
- {
-   PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
- 
-   return store->font_desc;
- }
- 
  static gchar *get_column_title (const GSheetModel *model, gint col);
  static gchar *get_row_title (const GSheetModel *model, gint row);
  static gboolean get_row_sensitivity (const GSheetModel *model, gint row);
@@@ -304,7 -317,6 +295,6 @@@ psppire_var_store_sheet_model_init (GSh
    iface->is_editable = psppire_var_store_is_editable;
    iface->get_foreground = psppire_var_store_get_foreground;
    iface->get_background = NULL;
-   iface->get_font_desc = psppire_var_store_get_font_desc;
    iface->get_cell_border = NULL;
    iface->get_justification = NULL;
  
@@@ -726,18 -738,6 +716,6 @@@ psppire_var_store_get_var_cnt (PsppireV
  }
  
  
- void
- psppire_var_store_set_font (PsppireVarStore *store, const PangoFontDescription *fd)
- {
-   g_return_if_fail (store);
-   g_return_if_fail (PSPPIRE_IS_VAR_STORE (store));
- 
-   store->font_desc = fd;
- 
-   g_sheet_model_range_changed (G_SHEET_MODEL (store), -1, -1, -1, -1);
- }
- 
- 
  static glong
  psppire_var_store_get_row_count (const GSheetModel * model)
  {

diff --combined src/ui/gui/psppire-var-store.h
index 7ef186a0a1b06067f22dbb6899866558a91ee97a,160812ca9a1c72236f38ace5898b3c677d6cd6da..cf4375898f737fd782196c51cf7143cc8334b4d4
--- 1/src/ui/gui/psppire-var-store.h
--- 2/src/ui/gui/psppire-var-store.h
+++ b/src/ui/gui/psppire-var-store.h
@@@ -65,7 -65,7 +65,6 @@@ struct _PsppireVarStor
    /*< private >*/
    PsppireDict *dict;
    GdkColor disabled;
-   const PangoFontDescription *font_desc;
 -  gint trailing_rows;
    PsppireVarStoreFormatType format_type;
  };