#include <data/dictionary.h>
#include <data/variable.h>
+#include <data/format.h>
#include <data/missing-values.h>
#include "val-labs-dialog.h"
pspec);
}
+#define DISABLED_COLOR "gray"
+
static void
psppire_var_store_init (PsppireVarStore *var_store)
{
- GdkColormap *colormap = gdk_colormap_get_system ();
-
- g_assert (gdk_color_parse ("gray", &var_store->disabled));
-
- gdk_colormap_alloc_color (colormap, &var_store->disabled, FALSE, TRUE);
+ if ( ! gdk_color_parse (DISABLED_COLOR, &var_store->disabled))
+ g_critical ("Could not parse color \"%s\"", DISABLED_COLOR);
var_store->dict = 0;
var_store->trailing_rows = 40;
}
-static const GdkColor *
+static GdkColor *
psppire_var_store_get_foreground (const GSheetModel *model, glong row, glong column)
{
PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
iface->get_background = NULL;
iface->get_font_desc = psppire_var_store_get_font_desc;
iface->get_cell_border = NULL;
+ iface->get_justification = NULL;
}
/* Row related funcs */
static glong
-geometry_get_row_count (const GSheetRow *geom, gpointer data)
+geometry_get_row_count (const GSheetRow *geom)
{
gint rows = 0;
PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
static gint
-geometry_get_height (const GSheetRow *geom, glong row, gpointer data)
+geometry_get_height (const GSheetRow *geom, glong row)
{
return 25;
}
static gboolean
-geometry_is_sensitive (const GSheetRow *geom, glong row, gpointer data)
+geometry_is_sensitive (const GSheetRow *geom, glong row)
{
PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
return row < psppire_dict_get_var_cnt (vs->dict);
}
-static
-gboolean always_true ()
-{
- return TRUE;
-}
-
-
static gchar *
-geometry_get_button_label (const GSheetRow *geom, glong unit, gpointer data)
+geometry_get_button_label (const GSheetRow *geom, glong unit)
{
gchar *label = g_strdup_printf (_("%ld"), unit + 1);
{
iface->get_row_count = geometry_get_row_count;
iface->get_height = geometry_get_height;
- iface->set_height = 0;
- iface->get_visibility = always_true;
+ iface->set_height = NULL;
iface->get_sensitivity = geometry_is_sensitive;
iface->get_button_label = geometry_get_button_label;
}
-
-