/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2017 Free Software Foundation
+ Copyright (C) 2017, 2020 Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
struct variable *var =
psppire_dict_get_variable (PSPPIRE_DICT (dict), row);
+ if (var == NULL)
+ return;
+
const struct fmt_spec *format = var_get_write_format (var);
struct fmt_spec fmt = *format;
GtkWindow *win = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sheet)));
struct variable *var =
psppire_dict_get_variable (PSPPIRE_DICT (dict), row);
+ if (var == NULL)
+ return;
+
struct missing_values mv;
if (GTK_RESPONSE_OK ==
psppire_missing_val_dialog_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sheet))),
struct variable *var =
psppire_dict_get_variable (PSPPIRE_DICT (dict), row);
+ if (var == NULL)
+ return;
+
struct val_labs *vls =
psppire_val_labs_dialog_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sheet))), var);
PsppireDict *dict = NULL;
g_object_get (var_sheet, "data-model", &dict, NULL);
- int n_rows = psppire_dict_get_var_cnt (dict);
+ int n_rows = psppire_dict_get_n_vars (dict);
if (row > n_rows)
return;
if (NULL == var)
var = psppire_dict_insert_variable (dict, row, NULL);
+ g_return_if_fail (var);
+
switch (col)
{
case DICT_TVM_COL_NAME:
{
const char *name = g_value_get_string (value);
- if (psppire_dict_check_name (dict, name, FALSE))
+ if (psppire_dict_check_name (dict, name))
dict_rename_var (dict->dict, var, g_value_get_string (value));
}
break;
(*G_OBJECT_CLASS (parent_class)->finalize) (object);
}
+static void
+psppire_variable_sheet_realize (GtkWidget *widget)
+{
+ /* This is a kludge. These are properties from the parent class.
+ They should really be set immediately after initialisation, but there is no
+ simple way to do that. */
+ g_object_set (widget,
+ "editable", TRUE,
+ "select-renderer-func", select_renderer_func,
+ "vertical-draggable", TRUE,
+ "forward-conversion", var_sheet_data_to_string,
+ NULL);
+
+ if (GTK_WIDGET_CLASS (parent_class)->realize)
+ (*GTK_WIDGET_CLASS (parent_class)->realize) (widget);
+}
+
+
static void
psppire_variable_sheet_class_init (PsppireVariableSheetClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
object_class->dispose = psppire_variable_sheet_dispose;
parent_class = g_type_class_peek_parent (class);
+ widget_class->realize = psppire_variable_sheet_realize;
object_class->finalize = psppire_variable_sheet_finalize;
}
GtkWidget*
psppire_variable_sheet_new (void)
{
- PsppireVarSheetHeader *vsh =
- g_object_new (PSPPIRE_TYPE_VAR_SHEET_HEADER, NULL);
-
- GObject *obj =
- g_object_new (PSPPIRE_TYPE_VARIABLE_SHEET,
- "select-renderer-func", select_renderer_func,
- "hmodel", vsh,
- "forward-conversion", var_sheet_data_to_string,
- "editable", TRUE,
- "vertical-draggable", TRUE,
- NULL);
-
- return GTK_WIDGET (obj);
+ return g_object_new (PSPPIRE_TYPE_VARIABLE_SHEET, NULL);
}
static void
g_signal_connect (sheet, "row-moved",
G_CALLBACK (move_variable), NULL);
+
+ PsppireVarSheetHeader *vsh =
+ g_object_new (PSPPIRE_TYPE_VAR_SHEET_HEADER, NULL);
+
+ g_object_set (sheet,
+ "hmodel", vsh,
+ NULL);
}