X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-var-store.c;h=efe1ae0deea81cca0abfd2d685d16a4f7377cb0b;hb=6351e3631c90fe46d70a8801a7a32f289cbba08f;hp=7edc665a21cee5cd843e990d312d28648889ae30;hpb=f82952d22e200e1b35cea23545857a2cf2f02c66;p=pspp diff --git a/src/ui/gui/psppire-var-store.c b/src/ui/gui/psppire-var-store.c index 7edc665a21..efe1ae0dee 100644 --- a/src/ui/gui/psppire-var-store.c +++ b/src/ui/gui/psppire-var-store.c @@ -33,6 +33,7 @@ #include #include +#include #include #include "val-labs-dialog.h" @@ -238,14 +239,13 @@ psppire_var_store_class_init (PsppireVarStoreClass *class) 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; @@ -307,7 +307,7 @@ psppire_var_store_is_editable (const GSheetModel *model, glong row, glong column } -static const GdkColor * +static GdkColor * psppire_var_store_get_foreground (const GSheetModel *model, glong row, glong column) { PsppireVarStore *store = PSPPIRE_VAR_STORE (model); @@ -346,6 +346,7 @@ psppire_var_store_sheet_model_init (GSheetModelIface *iface) iface->get_background = NULL; iface->get_font_desc = psppire_var_store_get_font_desc; iface->get_cell_border = NULL; + iface->get_justification = NULL; } @@ -796,7 +797,7 @@ psppire_var_store_get_column_count (const GSheetModel * model) /* 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); @@ -809,14 +810,14 @@ geometry_get_row_count (const GSheetRow *geom, gpointer data) 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); @@ -826,15 +827,8 @@ geometry_is_sensitive (const GSheetRow *geom, glong row, gpointer data) 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); @@ -846,12 +840,9 @@ psppire_var_store_sheet_row_init (GSheetRowIface *iface) { 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; } - -