projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include format.h only where necessary.
[pspp]
/
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 6bf5c55007e761e391291abb10b7a3ae3acde371..fa356b812d60dc47e3b160e8079b3c6caf8cfc70 100644
(file)
--- a/
src/ui/gui/psppire-var-store.c
+++ b/
src/ui/gui/psppire-var-store.c
@@
-28,11
+28,12
@@
#include <gtksheet/gsheetmodel.h>
#include "psppire-var-store.h"
#include <gtksheet/gsheetmodel.h>
#include "psppire-var-store.h"
-#include
"var-sheet.h"
+#include
<gtksheet/gsheet-row-iface.h>
#include "helper.h"
#include <data/dictionary.h>
#include <data/variable.h>
#include "helper.h"
#include <data/dictionary.h>
#include <data/variable.h>
+#include <data/format.h>
#include <data/missing-values.h>
#include "val-labs-dialog.h"
#include <data/missing-values.h>
#include "val-labs-dialog.h"
@@
-262,7
+263,7
@@
psppire_var_store_item_editable (PsppireVarStore *var_store, glong row, glong co
if ( !pv )
return TRUE;
if ( !pv )
return TRUE;
- if ( var_is_alpha (pv) && column == COL_DECIMALS )
+ if ( var_is_alpha (pv) && column ==
PSPPIRE_VAR_STORE_
COL_DECIMALS )
return FALSE;
write_spec = var_get_print_format (pv);
return FALSE;
write_spec = var_get_print_format (pv);
@@
-282,7
+283,7
@@
psppire_var_store_item_editable (PsppireVarStore *var_store, glong row, glong co
case FMT_DTIME:
case FMT_WKDAY:
case FMT_MONTH:
case FMT_DTIME:
case FMT_WKDAY:
case FMT_MONTH:
- if ( column ==
COL_DECIMALS || column ==
COL_WIDTH)
+ if ( column ==
PSPPIRE_VAR_STORE_COL_DECIMALS || column == PSPPIRE_VAR_STORE_
COL_WIDTH)
return FALSE;
break;
default:
return FALSE;
break;
default:
@@
-375,7
+376,7
@@
var_change_callback (GtkWidget *w, gint n, gpointer data)
GSheetModel *model = G_SHEET_MODEL (data);
g_sheet_model_range_changed (model,
GSheetModel *model = G_SHEET_MODEL (data);
g_sheet_model_range_changed (model,
- n, 0, n, n_COLS);
+ n, 0, n,
PSPPIRE_VAR_STORE_
n_COLS);
}
}
@@
-480,7
+481,7
@@
psppire_var_store_clear (GSheetModel *model, glong row, glong col)
switch (col)
{
switch (col)
{
- case COL_LABEL:
+ case
PSPPIRE_VAR_STORE_
COL_LABEL:
var_set_label (pv, 0);
return TRUE;
break;
var_set_label (pv, 0);
return TRUE;
break;
@@
-511,15
+512,15
@@
psppire_var_store_set_string (GSheetModel *model,
switch (col)
{
switch (col)
{
- case COL_NAME:
+ case
PSPPIRE_VAR_STORE_
COL_NAME:
return psppire_dict_rename_var (var_store->dict, pv, text);
break;
return psppire_dict_rename_var (var_store->dict, pv, text);
break;
- case COL_COLUMNS:
+ case
PSPPIRE_VAR_STORE_
COL_COLUMNS:
if ( ! text) return FALSE;
var_set_display_width (pv, atoi (text));
return TRUE;
break;
if ( ! text) return FALSE;
var_set_display_width (pv, atoi (text));
return TRUE;
break;
- case COL_WIDTH:
+ case
PSPPIRE_VAR_STORE_
COL_WIDTH:
{
int width = atoi (text);
if ( ! text) return FALSE;
{
int width = atoi (text);
if ( ! text) return FALSE;
@@
-545,7
+546,7
@@
psppire_var_store_set_string (GSheetModel *model,
return TRUE;
}
break;
return TRUE;
}
break;
- case COL_DECIMALS:
+ case
PSPPIRE_VAR_STORE_
COL_DECIMALS:
{
bool for_input
= var_store->format_type == PSPPIRE_VAR_STORE_INPUT_FORMATS;
{
bool for_input
= var_store->format_type == PSPPIRE_VAR_STORE_INPUT_FORMATS;
@@
-566,15
+567,15
@@
psppire_var_store_set_string (GSheetModel *model,
return TRUE;
}
break;
return TRUE;
}
break;
- case COL_LABEL:
+ case
PSPPIRE_VAR_STORE_
COL_LABEL:
var_set_label (pv, text);
return TRUE;
break;
var_set_label (pv, text);
return TRUE;
break;
- case COL_TYPE:
- case COL_VALUES:
- case COL_MISSING:
- case COL_ALIGN:
- case COL_MEASURE:
+ case
PSPPIRE_VAR_STORE_
COL_TYPE:
+ case
PSPPIRE_VAR_STORE_
COL_VALUES:
+ case
PSPPIRE_VAR_STORE_
COL_MISSING:
+ case
PSPPIRE_VAR_STORE_
COL_ALIGN:
+ case
PSPPIRE_VAR_STORE_
COL_MEASURE:
/* These can be modified only by their respective dialog boxes */
return FALSE;
break;
/* These can be modified only by their respective dialog boxes */
return FALSE;
break;
@@
-610,10
+611,10
@@
text_for_column (const struct variable *pv, gint c, GError **err)
switch (c)
{
switch (c)
{
- case COL_NAME:
+ case
PSPPIRE_VAR_STORE_
COL_NAME:
return pspp_locale_to_utf8 ( var_get_name (pv), -1, err);
break;
return pspp_locale_to_utf8 ( var_get_name (pv), -1, err);
break;
- case COL_TYPE:
+ case
PSPPIRE_VAR_STORE_
COL_TYPE:
{
switch ( write_spec->type )
{
{
switch ( write_spec->type )
{
@@
-667,7
+668,7
@@
text_for_column (const struct variable *pv, gint c, GError **err)
}
}
break;
}
}
break;
- case COL_WIDTH:
+ case
PSPPIRE_VAR_STORE_
COL_WIDTH:
{
gchar *s;
GString *gstr = g_string_sized_new (10);
{
gchar *s;
GString *gstr = g_string_sized_new (10);
@@
-677,7
+678,7
@@
text_for_column (const struct variable *pv, gint c, GError **err)
return s;
}
break;
return s;
}
break;
- case COL_DECIMALS:
+ case
PSPPIRE_VAR_STORE_
COL_DECIMALS:
{
gchar *s;
GString *gstr = g_string_sized_new (10);
{
gchar *s;
GString *gstr = g_string_sized_new (10);
@@
-687,7
+688,7
@@
text_for_column (const struct variable *pv, gint c, GError **err)
return s;
}
break;
return s;
}
break;
- case COL_COLUMNS:
+ case
PSPPIRE_VAR_STORE_
COL_COLUMNS:
{
gchar *s;
GString *gstr = g_string_sized_new (10);
{
gchar *s;
GString *gstr = g_string_sized_new (10);
@@
-697,16
+698,16
@@
text_for_column (const struct variable *pv, gint c, GError **err)
return s;
}
break;
return s;
}
break;
- case COL_LABEL:
+ case
PSPPIRE_VAR_STORE_
COL_LABEL:
return pspp_locale_to_utf8 (var_get_label (pv), -1, err);
break;
return pspp_locale_to_utf8 (var_get_label (pv), -1, err);
break;
- case COL_MISSING:
+ case
PSPPIRE_VAR_STORE_
COL_MISSING:
{
return missing_values_to_string (pv, err);
}
break;
{
return missing_values_to_string (pv, err);
}
break;
- case COL_VALUES:
+ case
PSPPIRE_VAR_STORE_
COL_VALUES:
{
if ( ! var_has_value_labels (pv))
return g_locale_to_utf8 (gettext (none), -1, 0, 0, err);
{
if ( ! var_has_value_labels (pv))
return g_locale_to_utf8 (gettext (none), -1, 0, 0, err);
@@
-735,7
+736,7
@@
text_for_column (const struct variable *pv, gint c, GError **err)
}
}
break;
}
}
break;
- case COL_ALIGN:
+ case
PSPPIRE_VAR_STORE_
COL_ALIGN:
{
const gint align = var_get_alignment (pv);
{
const gint align = var_get_alignment (pv);
@@
-743,7
+744,7
@@
text_for_column (const struct variable *pv, gint c, GError **err)
return g_locale_to_utf8 (gettext (alignments[align]), -1, 0, 0, err);
}
break;
return g_locale_to_utf8 (gettext (alignments[align]), -1, 0, 0, err);
}
break;
- case COL_MEASURE:
+ case
PSPPIRE_VAR_STORE_
COL_MEASURE:
{
return measure_to_string (pv, err);
}
{
return measure_to_string (pv, err);
}
@@
-789,14
+790,14
@@
psppire_var_store_get_row_count (const GSheetModel * model)
static glong
psppire_var_store_get_column_count (const GSheetModel * model)
{
static glong
psppire_var_store_get_column_count (const GSheetModel * model)
{
- return n_COLS ;
+ return
PSPPIRE_VAR_STORE_
n_COLS ;
}
/* Row related funcs */
static glong
}
/* 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);
{
gint rows = 0;
PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
@@
-809,14
+810,14
@@
geometry_get_row_count (const GSheetRow *geom, gpointer data)
static gint
static gint
-geometry_get_height (const GSheetRow *geom, glong row
, gpointer data
)
+geometry_get_height (const GSheetRow *geom, glong row)
{
return 25;
}
static gboolean
{
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);
{
PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
@@
-834,7
+835,7
@@
gboolean always_true ()
static gchar *
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);
{
gchar *label = g_strdup_printf (_("%ld"), unit + 1);