projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
examples: Change extensions from .stat to .sps.
[pspp]
/
src
/
ui
/
gui
/
psppire-var-sheet.c
diff --git
a/src/ui/gui/psppire-var-sheet.c
b/src/ui/gui/psppire-var-sheet.c
index 70e1044fcb25ed9d46dbc2fcc8d2232c3687fda6..648d9fd786ee149bdeafd7e972c382d4893dc66a 100644
(file)
--- a/
src/ui/gui/psppire-var-sheet.c
+++ b/
src/ui/gui/psppire-var-sheet.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009
, 2011
Free Software Foundation, Inc.
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
@@
-18,6
+18,7
@@
#include "psppire-var-sheet.h"
#include <ui/gui/sheet/psppire-axis.h>
#include "psppire-var-sheet.h"
#include <ui/gui/sheet/psppire-axis.h>
+#include "builder-wrapper.h"
#include "helper.h"
#include "customentry.h"
#include "helper.h"
#include "customentry.h"
@@
-387,8
+388,6
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
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),
@@
-433,7
+432,7
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
const gint current_value = g_strtod (s, NULL);
GtkObject *adj ;
const gint current_value = g_strtod (s, NULL);
GtkObject *adj ;
- const struct fmt_spec *fmt = var_get_
write
_format (var);
+ const struct fmt_spec *fmt = var_get_
print
_format (var);
switch (column)
{
case PSPPIRE_VAR_STORE_COL_WIDTH:
switch (column)
{
case PSPPIRE_VAR_STORE_COL_WIDTH:
@@
-453,9
+452,9
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
}
adj = gtk_adjustment_new (current_value,
}
adj = gtk_adjustment_new (current_value,
- r_min, r_max,
-
1.0, 1.0, 1.0
/* steps */
- );
+
r_min, r_max,
+
1.0, 1.0,
/* steps */
+
0
);
psppire_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
psppire_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
@@
-483,8
+482,7
@@
psppire_var_sheet_realize (GtkWidget *w)
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->var_type_dialog = var_type_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));