Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp

[pspp-builds.git] / src / ui / gui / psppire-var-store.c

diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c
index cdb32719eda7fe67888f4185b484d7f7827e2d39..8e78e2ec62218d3a339f346acbabee03fb25bb52 100644 (file)
--- a/src/ui/gui/psppire-var-store.c
+++ b/src/ui/gui/psppire-var-store.c
@@ -191,7 +191,7 @@ psppire_var_store_class_init (PsppireVarStoreClass *class)
                              "Variable format type",
                              ("Whether variables have input or output "
                               "formats"),
-                             G_TYPE_PSPPIRE_VAR_STORE_FORMAT_TYPE,
+                             PSPPIRE_TYPE_VAR_STORE_FORMAT_TYPE,
                              PSPPIRE_VAR_STORE_OUTPUT_FORMATS,
                              G_PARAM_READWRITE);
 
@@ -301,6 +301,8 @@ psppire_var_store_sheet_model_init (PsppireSheetModelIface *iface)
 
   iface->get_row_title = get_row_title;
   iface->get_row_sensitivity = get_row_sensitivity;
+
+  iface->get_row_overstrike = NULL;
 }
 
 /**
@@ -540,7 +542,7 @@ psppire_var_store_set_string (PsppireSheetModel *model,
 }
 
 
-const static gchar none[] = N_("None");
+static const gchar none[] = N_("None");
 
 static  gchar *
 text_for_column (const struct variable *pv, gint c, GError **err)