Previously all of the dialog boxes used by the variable sheet
kept around a pointer to the dictionary solely to obtain the
dictionary's encoding. Previous commits have eliminated that
use, so this commit gets rid of the dictionary members.
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2005 Free Software Foundation
+ Copyright (C) 2005, 2011 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
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
/* The variable whose missing values are to be updated */
struct variable *pv;
/* The variable whose missing values are to be updated */
struct variable *pv;
- /* The dictionary to which that value belongs */
- PsppireDict *dict;
-
/* local copy */
struct missing_values mvl;
/* local copy */
struct missing_values mvl;
vs->missing_val_dialog->pv =
psppire_var_store_get_var (var_store, row);
vs->missing_val_dialog->pv =
psppire_var_store_get_var (var_store, row);
- vs->missing_val_dialog->dict = var_store->dictionary;
-
g_signal_connect_swapped (customEntry,
"clicked",
G_CALLBACK (missing_val_dialog_show),
g_signal_connect_swapped (customEntry,
"clicked",
G_CALLBACK (missing_val_dialog_show),
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (vs));
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (vs));
- vs->val_labs_dialog = val_labs_dialog_create (GTK_WINDOW (toplevel),
- PSPPIRE_VAR_STORE (psppire_sheet_get_model (PSPPIRE_SHEET (vs))));
+ vs->val_labs_dialog = val_labs_dialog_create (GTK_WINDOW (toplevel));
vs->missing_val_dialog = missing_val_dialog_create (GTK_WINDOW (toplevel));
vs->missing_val_dialog = missing_val_dialog_create (GTK_WINDOW (toplevel));
- vs->var_type_dialog = var_type_dialog_create (GTK_WINDOW (toplevel),
- PSPPIRE_VAR_STORE (psppire_sheet_get_model (PSPPIRE_SHEET (vs))));
+ vs->var_type_dialog = var_type_dialog_create (GTK_WINDOW (toplevel));
/* Chain up to the parent class */
GTK_WIDGET_CLASS (parent_class)->realize (w);
/* Chain up to the parent class */
GTK_WIDGET_CLASS (parent_class)->realize (w);
- PsppireVarStore *var_store;
- PsppireDict *dict;
-
/* The variable to be updated */
struct variable *pv;
/* The variable to be updated */
struct variable *pv;
/* Create a new dialog box
(there should normally be only one)*/
struct val_labs_dialog *
/* Create a new dialog box
(there should normally be only one)*/
struct val_labs_dialog *
-val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store)
+val_labs_dialog_create (GtkWindow *toplevel)
{
GtkTreeViewColumn *column;
{
GtkTreeViewColumn *column;
struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog));
- dialog->var_store = var_store;
- g_object_get (var_store, "dictionary", &dialog->dict, NULL);
dialog->window = get_widget_assert (xml,"val_labs_dialog");
dialog->value_entry = get_widget_assert (xml,"value_entry");
dialog->label_entry = get_widget_assert (xml,"label_entry");
dialog->window = get_widget_assert (xml,"val_labs_dialog");
dialog->value_entry = get_widget_assert (xml,"value_entry");
dialog->label_entry = get_widget_assert (xml,"label_entry");
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2005 Free Software Foundation
+ Copyright (C) 2005, 2011 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
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 val_labs_dialog * val_labs_dialog_create (GtkWindow *, PsppireVarStore *);
+struct val_labs_dialog * val_labs_dialog_create (GtkWindow *);
void val_labs_dialog_show (struct val_labs_dialog *);
void val_labs_dialog_show (struct val_labs_dialog *);
/* Create the structure */
struct var_type_dialog *
/* Create the structure */
struct var_type_dialog *
-var_type_dialog_create (GtkWindow *toplevel, PsppireVarStore *vs)
+var_type_dialog_create (GtkWindow *toplevel)
{
gint i;
struct var_type_dialog *dialog = g_malloc (sizeof (struct var_type_dialog));
GtkBuilder *xml = builder_new ("var-sheet-dialogs.ui");
{
gint i;
struct var_type_dialog *dialog = g_malloc (sizeof (struct var_type_dialog));
GtkBuilder *xml = builder_new ("var-sheet-dialogs.ui");
dialog->window = get_widget_assert (xml,"var_type_dialog");
dialog->active_button = -1;
dialog->window = get_widget_assert (xml,"var_type_dialog");
dialog->active_button = -1;
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2005 Free Software Foundation
+ Copyright (C) 2005, 2011 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
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
/* Variable to be updated */
struct variable *pv;
/* Variable to be updated */
struct variable *pv;
- /* The variable store to which this dialog relates */
- PsppireVarStore *vs;
-
-
/* Local copy of format specifier */
struct fmt_spec fmt_l;
/* Local copy of format specifier */
struct fmt_spec fmt_l;
-struct var_type_dialog * var_type_dialog_create (GtkWindow *, PsppireVarStore *vs);
+struct var_type_dialog * var_type_dialog_create (GtkWindow *);
void var_type_dialog_show (struct var_type_dialog *dialog);
void var_type_dialog_show (struct var_type_dialog *dialog);