projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure that windows opens the right file for output.
[pspp]
/
src
/
ui
/
gui
/
var-type-dialog.c
diff --git
a/src/ui/gui/var-type-dialog.c
b/src/ui/gui/var-type-dialog.c
index dfdd895f6192f9964bda5785b02748d85441fe29..db2e85b5f792bc5b4c5ee96daed8891ae8b0de19 100644
(file)
--- a/
src/ui/gui/var-type-dialog.c
+++ b/
src/ui/gui/var-type-dialog.c
@@
-332,6
+332,7
@@
var_type_dialog_create (GladeXML *xml)
g_assert (xml);
dialog->window = get_widget_assert (xml,"var_type_dialog");
g_assert (xml);
dialog->window = get_widget_assert (xml,"var_type_dialog");
+ dialog->active_button = -1;
g_signal_connect (dialog->window, "delete-event",
g_signal_connect (dialog->window, "delete-event",
@@
-444,7
+445,7
@@
var_type_dialog_create (GladeXML *xml)
g_object_unref (list_store);
g_object_unref (list_store);
- g_signal_connect (
GTK_OBJECT (dialog->date_format_treeview)
, "cursor-changed",
+ g_signal_connect (
dialog->date_format_treeview
, "cursor-changed",
GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
@@
-467,7
+468,7
@@
var_type_dialog_create (GladeXML *xml)
for ( i = 0 ; i < sizeof (dollar_format)/sizeof (dollar_format[0]) ; ++i )
{
for ( i = 0 ; i < sizeof (dollar_format)/sizeof (dollar_format[0]) ; ++i )
{
- char *template =
fmt
_dollar_template (&dollar_format[i]);
+ char *template =
settings
_dollar_template (&dollar_format[i]);
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
0, template,
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
0, template,
@@
-481,11
+482,11
@@
var_type_dialog_create (GladeXML *xml)
g_object_unref (list_store);
g_object_unref (list_store);
- g_signal_connect (
GTK_OBJECT (dialog->dollar_treeview)
,
+ g_signal_connect (
dialog->dollar_treeview
,
"cursor-changed",
GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
"cursor-changed",
GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
- g_signal_connect_swapped (
GTK_OBJECT (dialog->dollar_treeview)
,
+ g_signal_connect_swapped (
dialog->dollar_treeview
,
"cursor-changed",
GTK_SIGNAL_FUNC (update_width_decimals), dialog);
"cursor-changed",
GTK_SIGNAL_FUNC (update_width_decimals), dialog);
@@
-525,22
+526,22
@@
var_type_dialog_create (GladeXML *xml)
g_object_unref (list_store);
g_object_unref (list_store);
- g_signal_connect (
GTK_OBJECT (dialog->custom_treeview)
,
+ g_signal_connect (
dialog->custom_treeview
,
"cursor-changed",
GTK_SIGNAL_FUNC (set_format_type_from_treeview), dialog);
"cursor-changed",
GTK_SIGNAL_FUNC (set_format_type_from_treeview), dialog);
- g_signal_connect (
GTK_OBJECT (dialog->custom_treeview)
,
+ g_signal_connect (
dialog->custom_treeview
,
"cursor-changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
"cursor-changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
- g_signal_connect (
GTK_OBJECT (dialog->entry_width)
,
+ g_signal_connect (
dialog->entry_width
,
"changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
"changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
- g_signal_connect (
GTK_OBJECT (dialog->entry_decimals)
,
+ g_signal_connect (
dialog->entry_decimals
,
"changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
"changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
@@
-790,14
+791,14
@@
on_var_type_ok_clicked (GtkWidget *w, gpointer data)
gint decimals = atoi (gtk_entry_get_text
(GTK_ENTRY (dialog->entry_decimals)));
gint decimals = atoi (gtk_entry_get_text
(GTK_ENTRY (dialog->entry_decimals)));
- gint new_type = VA
R
_NUMERIC;
+ gint new_type = VA
L
_NUMERIC;
gint new_width = 0;
bool result = false;
struct fmt_spec spec;
switch (dialog->active_button)
{
case BUTTON_STRING:
gint new_width = 0;
bool result = false;
struct fmt_spec spec;
switch (dialog->active_button)
{
case BUTTON_STRING:
- new_type = VA
R
_STRING;
+ new_type = VA
L
_STRING;
new_width = width;
result = make_output_format_try (&spec, FMT_A, width, 0);
break;
new_width = width;
result = make_output_format_try (&spec, FMT_A, width, 0);
break;