[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src/ui/gui about.c customentry.c data-edit...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp/src/ui/gui about.c customentry.c data-edit... |
|
Date: |
Sun, 24 Dec 2006 23:08:25 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 06/12/24 23:08:25
Modified files:
src/ui/gui : about.c customentry.c data-editor.c
data-sheet.c message-dialog.c
missing-val-dialog.c psppire-case-file.c
psppire-data-store.c psppire-dict.c
psppire-var-store.c psppire.c
sort-cases-dialog.c syntax-editor.c var-sheet.c
var-type-dialog.c window-manager.c
Log message:
Whitespace changes only.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/about.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/customentry.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-sheet.c?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/message-dialog.c?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/missing-val-dialog.c?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-case-file.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.c?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dict.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-var-store.c?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/sort-cases-dialog.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/syntax-editor.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-sheet.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-type-dialog.c?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/window-manager.c?cvsroot=pspp&r1=1.1&r2=1.2
Patches:
Index: about.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/about.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- about.c 24 Dec 2006 23:02:33 -0000 1.2
+++ about.c 24 Dec 2006 23:08:25 -0000 1.3
@@ -15,17 +15,17 @@
GdkPixbuf *pb =
gdk_pixbuf_new_from_file_at_size (PKGDATADIR "/pspplogo.png", 64, 64, 0);
- gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG(about), pb);
+ gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG (about), pb);
- gtk_window_set_icon_from_file (GTK_WINDOW(about),
+ gtk_window_set_icon_from_file (GTK_WINDOW (about),
PKGDATADIR "/psppicon.png", 0);
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about),
(const gchar **) authors);
- gtk_window_set_transient_for (GTK_WINDOW(about), parent);
+ gtk_window_set_transient_for (GTK_WINDOW (about), parent);
gtk_window_set_modal (GTK_WINDOW (about), TRUE);
Index: customentry.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/customentry.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- customentry.c 24 Dec 2006 22:49:18 -0000 1.6
+++ customentry.c 24 Dec 2006 23:08:25 -0000 1.7
@@ -256,7 +256,7 @@
psppire_custom_entry_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- PsppireCustomEntry *ce = PSPPIRE_CUSTOM_ENTRY(widget);
+ PsppireCustomEntry *ce = PSPPIRE_CUSTOM_ENTRY (widget);
g_return_val_if_fail (PSPPIRE_IS_CUSTOM_ENTRY (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@@ -342,7 +342,7 @@
custom_entry_signals[CLICKED] =
g_signal_new ("clicked",
- G_TYPE_FROM_CLASS(gobject_class),
+ G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
Index: data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- data-editor.c 23 Dec 2006 09:03:45 -0000 1.1
+++ data-editor.c 24 Dec 2006 23:08:25 -0000 1.2
@@ -195,10 +195,10 @@
data_editor_select_sheet (de, PAGE_DATA_SHEET);
- gtk_sheet_get_active_cell (GTK_SHEET(data_sheet),
+ gtk_sheet_get_active_cell (GTK_SHEET (data_sheet),
¤t_row, ¤t_column);
- gtk_sheet_set_active_cell (GTK_SHEET(data_sheet), current_row, row);
+ gtk_sheet_set_active_cell (GTK_SHEET (data_sheet), current_row, row);
return FALSE;
}
@@ -217,10 +217,10 @@
data_editor_select_sheet (de, PAGE_VAR_SHEET);
- gtk_sheet_get_active_cell (GTK_SHEET(var_sheet),
+ gtk_sheet_get_active_cell (GTK_SHEET (var_sheet),
¤t_row, ¤t_column);
- gtk_sheet_set_active_cell (GTK_SHEET(var_sheet), col, current_column);
+ gtk_sheet_set_active_cell (GTK_SHEET (var_sheet), col, current_column);
return FALSE;
}
@@ -309,18 +309,18 @@
gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
gtk_file_filter_add_pattern (filter, "*.sav");
gtk_file_filter_add_pattern (filter, "*.SAV");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog), filter);
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
gtk_file_filter_add_pattern (filter, "*.por");
gtk_file_filter_add_pattern (filter, "*.POR");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog), filter);
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("All Files"));
gtk_file_filter_add_pattern (filter, "*");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog), filter);
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
do {
@@ -404,10 +404,10 @@
if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) )
{
GtkSheet *data_sheet =
- GTK_SHEET(get_widget_assert (de->xml, "data_sheet"));
+ GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
GtkSheet *var_sheet =
- GTK_SHEET(get_widget_assert (de->xml, "variable_sheet"));
+ GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
PsppireDataStore *ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model
(data_sheet));
PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model
(var_sheet));
Index: data-sheet.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-sheet.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- data-sheet.c 24 Dec 2006 23:02:33 -0000 1.17
+++ data-sheet.c 24 Dec 2006 23:08:25 -0000 1.18
@@ -49,7 +49,7 @@
gint n_vars;
PsppireDataStore *data_store =
- PSPPIRE_DATA_STORE(gtk_sheet_get_model (sheet));
+ PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
g_assert (data_store);
@@ -87,7 +87,7 @@
/* The entry where the reference to the current cell is displayed */
GtkEntry *cell_ref_entry;
- PsppireDataStore *data_store = PSPPIRE_DATA_STORE(gtk_sheet_get_model
(sheet));
+ PsppireDataStore *data_store = PSPPIRE_DATA_STORE (gtk_sheet_get_model
(sheet));
if (data_store)
{
const struct variable *pv =
@@ -102,7 +102,7 @@
text = g_strdup_printf ("%d: %s", row,
pv ? var_get_name (pv) : "");
- cell_ref_entry = GTK_ENTRY(get_widget_assert (data_editor_xml,
+ cell_ref_entry = GTK_ENTRY (get_widget_assert (data_editor_xml,
"cell_ref_entry"));
s = pspp_locale_to_utf8 (text, -1, 0);
@@ -139,10 +139,10 @@
pango_layout_get_extents (layout, NULL, &rect);
- g_object_unref (G_OBJECT(layout));
- g_object_unref (G_OBJECT(context));
+ g_object_unref (G_OBJECT (layout));
+ g_object_unref (G_OBJECT (context));
- return PANGO_PIXELS(rect.width);
+ return PANGO_PIXELS (rect.width);
}
@@ -151,7 +151,7 @@
font_change_callback (GObject *obj, gpointer data)
{
GtkWidget *sheet = data;
- PsppireDataStore *ds = PSPPIRE_DATA_STORE(obj);
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (obj);
ds->width_of_m = calc_m_width (sheet, ds->font_desc);
}
@@ -162,8 +162,8 @@
{
GtkWidget *sheet;
- sheet = gtk_sheet_new (G_SHEET_ROW(the_data_store),
- G_SHEET_COLUMN(the_data_store), "data sheet", 0);
+ sheet = gtk_sheet_new (G_SHEET_ROW (the_data_store),
+ G_SHEET_COLUMN (the_data_store), "data sheet", 0);
the_data_store->width_of_m = calc_m_width (sheet, the_data_store->font_desc);
@@ -178,10 +178,10 @@
g_signal_connect (G_OBJECT (the_data_store), "font-changed",
G_CALLBACK (font_change_callback), sheet);
- gtk_sheet_set_active_cell (GTK_SHEET(sheet), -1, -1);
+ gtk_sheet_set_active_cell (GTK_SHEET (sheet), -1, -1);
- gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL(the_data_store));
+ gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_data_store));
gtk_widget_show (sheet);
Index: message-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/message-dialog.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- message-dialog.c 24 Dec 2006 23:02:33 -0000 1.22
+++ message-dialog.c 24 Dec 2006 23:08:25 -0000 1.23
@@ -138,15 +138,15 @@
GTK_BUTTONS_CLOSE,
msg);
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("%s (line %d) %s"),
m->where.file_name,
m->where.line_number,
m->text);
- gtk_window_set_keep_above (GTK_WINDOW(dialog), TRUE);
+ gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
- gtk_dialog_run (GTK_DIALOG(dialog));
+ gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
Index: missing-val-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/missing-val-dialog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- missing-val-dialog.c 24 Dec 2006 22:49:18 -0000 1.10
+++ missing-val-dialog.c 24 Dec 2006 23:08:25 -0000 1.11
@@ -67,11 +67,11 @@
hbox = gtk_hbox_new (FALSE, 10);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
hbox);
- gtk_box_pack_start (GTK_BOX(hbox), icon, TRUE, FALSE, 10);
- gtk_box_pack_start (GTK_BOX(hbox), label, TRUE, TRUE, 10);
+ gtk_box_pack_start (GTK_BOX (hbox), icon, TRUE, FALSE, 10);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 10);
gtk_widget_show_all (dialog);
}
@@ -94,7 +94,7 @@
for (i = 0 ; i < 3 ; ++i )
{
gchar *text =
- g_strdup (gtk_entry_get_text (GTK_ENTRY(dialog->mv[i])));
+ g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->mv[i])));
union value v;
if ( !text || strlen (g_strstrip (text)) == 0 )
@@ -115,7 +115,7 @@
if ( nvals == 0 || badvals > 0 )
{
err_dialog (_("Incorrect value for variable type"),
- GTK_WINDOW(dialog->window));
+ GTK_WINDOW (dialog->window));
return ;
}
}
@@ -126,8 +126,8 @@
union value low_val ;
union value high_val;
- const gchar *low_text = gtk_entry_get_text (GTK_ENTRY(dialog->low));
- const gchar *high_text = gtk_entry_get_text (GTK_ENTRY(dialog->high));
+ const gchar *low_text = gtk_entry_get_text (GTK_ENTRY (dialog->low));
+ const gchar *high_text = gtk_entry_get_text (GTK_ENTRY (dialog->high));
if ( text_to_value (low_text, &low_val, *write_spec)
&&
@@ -136,19 +136,19 @@
if ( low_val.f > high_val.f )
{
err_dialog (_("Incorrect range specification"),
- GTK_WINDOW(dialog->window));
+ GTK_WINDOW (dialog->window));
return ;
}
}
else
{
err_dialog (_("Incorrect range specification"),
- GTK_WINDOW(dialog->window));
+ GTK_WINDOW (dialog->window));
return;
}
discrete_text =
- g_strdup (gtk_entry_get_text (GTK_ENTRY(dialog->discrete)));
+ g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->discrete)));
mv_clear (&dialog->mvl);
mv_add_num_range (&dialog->mvl, low_val.f, high_val.f);
@@ -160,7 +160,7 @@
*write_spec))
{
err_dialog (_("Incorrect value for variable type"),
- GTK_WINDOW(dialog->window) );
+ GTK_WINDOW (dialog->window) );
g_free (discrete_text);
return;
}
@@ -216,15 +216,15 @@
dialog->window = get_widget_assert (xml, "missing_values_dialog");
gtk_window_set_transient_for
- (GTK_WINDOW(dialog->window),
- GTK_WINDOW(get_widget_assert (xml, "data_editor")));
+ (GTK_WINDOW (dialog->window),
+ GTK_WINDOW (get_widget_assert (xml, "data_editor")));
g_signal_connect_swapped (get_widget_assert (xml, "missing_val_cancel"),
- "clicked", G_CALLBACK(gtk_widget_hide), dialog->window);
+ "clicked", G_CALLBACK (gtk_widget_hide), dialog->window);
g_signal_connect (get_widget_assert (xml, "missing_val_ok"),
- "clicked", G_CALLBACK(missing_val_dialog_accept), dialog);
+ "clicked", G_CALLBACK (missing_val_dialog_accept), dialog);
dialog->mv[0] = get_widget_assert (xml, "mv0");
@@ -237,20 +237,20 @@
dialog->button_none =
- GTK_TOGGLE_BUTTON(get_widget_assert (xml, "no_missing"));
+ GTK_TOGGLE_BUTTON (get_widget_assert (xml, "no_missing"));
dialog->button_discrete =
- GTK_TOGGLE_BUTTON(get_widget_assert (xml, "discrete_missing"));
+ GTK_TOGGLE_BUTTON (get_widget_assert (xml, "discrete_missing"));
dialog->button_range =
- GTK_TOGGLE_BUTTON(get_widget_assert (xml, "range_missing"));
+ GTK_TOGGLE_BUTTON (get_widget_assert (xml, "range_missing"));
- g_signal_connect (G_OBJECT(dialog->button_discrete), "toggled",
- G_CALLBACK(discrete), dialog);
+ g_signal_connect (G_OBJECT (dialog->button_discrete), "toggled",
+ G_CALLBACK (discrete), dialog);
- g_signal_connect (G_OBJECT(dialog->button_range), "toggled",
- G_CALLBACK(range), dialog);
+ g_signal_connect (G_OBJECT (dialog->button_range), "toggled",
+ G_CALLBACK (range), dialog);
return dialog;
}
@@ -270,20 +270,20 @@
write_spec = var_get_write_format (dialog->pv);
/* Blank all entry boxes and make them insensitive */
- gtk_entry_set_text (GTK_ENTRY(dialog->low), "");
- gtk_entry_set_text (GTK_ENTRY(dialog->high), "");
- gtk_entry_set_text (GTK_ENTRY(dialog->discrete), "");
+ gtk_entry_set_text (GTK_ENTRY (dialog->low), "");
+ gtk_entry_set_text (GTK_ENTRY (dialog->high), "");
+ gtk_entry_set_text (GTK_ENTRY (dialog->discrete), "");
gtk_widget_set_sensitive (dialog->low, FALSE);
gtk_widget_set_sensitive (dialog->high, FALSE);
gtk_widget_set_sensitive (dialog->discrete, FALSE);
- gtk_widget_set_sensitive (GTK_WIDGET(dialog->button_range),
+ gtk_widget_set_sensitive (GTK_WIDGET (dialog->button_range),
var_is_numeric (dialog->pv));
for (i = 0 ; i < 3 ; ++i )
{
- gtk_entry_set_text (GTK_ENTRY(dialog->mv[i]), "");
+ gtk_entry_set_text (GTK_ENTRY (dialog->mv[i]), "");
gtk_widget_set_sensitive (dialog->mv[i], FALSE);
}
@@ -297,8 +297,8 @@
low_text = value_to_text (low, *write_spec);
high_text = value_to_text (high, *write_spec);
- gtk_entry_set_text (GTK_ENTRY(dialog->low), low_text);
- gtk_entry_set_text (GTK_ENTRY(dialog->high), high_text);
+ gtk_entry_set_text (GTK_ENTRY (dialog->low), low_text);
+ gtk_entry_set_text (GTK_ENTRY (dialog->high), high_text);
g_free (low_text);
g_free (high_text);
@@ -308,7 +308,7 @@
union value value;
mv_peek_value (&dialog->mvl, &value, 0);
text = value_to_text (value, *write_spec);
- gtk_entry_set_text (GTK_ENTRY(dialog->discrete), text);
+ gtk_entry_set_text (GTK_ENTRY (dialog->discrete), text);
g_free (text);
}
@@ -331,7 +331,7 @@
mv_peek_value (&dialog->mvl, &value, i);
text = value_to_text (value, *write_spec);
- gtk_entry_set_text (GTK_ENTRY(dialog->mv[i]), text);
+ gtk_entry_set_text (GTK_ENTRY (dialog->mv[i]), text);
g_free (text);
}
gtk_widget_set_sensitive (dialog->mv[i], TRUE);
Index: psppire-case-file.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-case-file.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- psppire-case-file.c 24 Dec 2006 22:49:18 -0000 1.12
+++ psppire-case-file.c 24 Dec 2006 23:08:25 -0000 1.13
@@ -94,7 +94,7 @@
signal[CASE_CHANGED] =
g_signal_new ("case_changed",
- G_TYPE_FROM_CLASS(class),
+ G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@ -106,7 +106,7 @@
signal[CASE_INSERTED] =
g_signal_new ("case_inserted",
- G_TYPE_FROM_CLASS(class),
+ G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@ -118,7 +118,7 @@
signal[CASES_DELETED] =
g_signal_new ("cases_deleted",
- G_TYPE_FROM_CLASS(class),
+ G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@ -188,7 +188,7 @@
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->flexifile, FALSE);
- result = flexifile_delete_cases (FLEXIFILE(cf->flexifile), n_cases, first);
+ result = flexifile_delete_cases (FLEXIFILE (cf->flexifile), n_cases,
first);
g_signal_emit (cf, signal[CASES_DELETED], 0, n_cases, first);
@@ -206,7 +206,7 @@
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->flexifile, FALSE);
- result = flexifile_insert_case (FLEXIFILE(cf->flexifile), cc, posn);
+ result = flexifile_insert_case (FLEXIFILE (cf->flexifile), cc, posn);
if ( result )
g_signal_emit (cf, signal[CASE_INSERTED], 0, posn);
@@ -263,7 +263,7 @@
g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), NULL);
- flexifile_get_case (FLEXIFILE(cf->flexifile), casenum, &c);
+ flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, &c);
v = case_data_idx (&c, idx);
case_destroy (&c);
@@ -292,13 +292,13 @@
g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), FALSE);
- if ( ! flexifile_get_case (FLEXIFILE(cf->flexifile), casenum, &cc) )
+ if ( ! flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, &cc) )
return FALSE;
if ( width == 0 )
bytes = MAX_SHORT_STRING;
else
- bytes = DIV_RND_UP(width, MAX_SHORT_STRING) * MAX_SHORT_STRING ;
+ bytes = DIV_RND_UP (width, MAX_SHORT_STRING) * MAX_SHORT_STRING ;
/* Cast away const in flagrant abuse of the casefile */
memcpy ((union value *)case_data_idx (&cc, idx), v, bytes);
@@ -322,7 +322,7 @@
g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), FALSE);
- if ( ! flexifile_get_case (FLEXIFILE(cf->flexifile), casenum, &cc) )
+ if ( ! flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, &cc) )
return FALSE;
/* Cast away const in flagrant abuse of the casefile */
@@ -376,7 +376,7 @@
return TRUE;
}
- return flexifile_resize (FLEXIFILE(cf->flexifile), n_values, before);
+ return flexifile_resize (FLEXIFILE (cf->flexifile), n_values, before);
}
/* Fills C with the CASENUMth case.
@@ -389,5 +389,5 @@
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->flexifile, FALSE);
- return flexifile_get_case (FLEXIFILE(cf->flexifile), casenum, c);
+ return flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, c);
}
Index: psppire-data-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- psppire-data-store.c 24 Dec 2006 22:49:18 -0000 1.28
+++ psppire-data-store.c 24 Dec 2006 23:08:25 -0000 1.29
@@ -154,7 +154,7 @@
signal[FONT_CHANGED] =
g_signal_new ("font_changed",
- G_TYPE_FROM_CLASS(class),
+ G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@ -168,7 +168,7 @@
static gint
psppire_data_store_get_var_count (const GSheetModel *model)
{
- const PsppireDataStore *store = PSPPIRE_DATA_STORE(model);
+ const PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
return psppire_dict_get_var_cnt (store->dict);
}
@@ -176,7 +176,7 @@
static gint
psppire_data_store_get_case_count (const GSheetModel *model)
{
- const PsppireDataStore *store = PSPPIRE_DATA_STORE(model);
+ const PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
return psppire_case_file_get_case_count (store->case_file);
}
@@ -194,7 +194,7 @@
psppire_data_store_get_font_desc (const GSheetModel *model,
gint row, gint column)
{
- PsppireDataStore *store = PSPPIRE_DATA_STORE(model);
+ PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
return store->font_desc;
}
@@ -231,11 +231,11 @@
g_return_if_fail (data);
- store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE (data);
g_assert (first >= 0);
- g_sheet_model_rows_deleted (G_SHEET_MODEL(store), first, n_cases);
+ g_sheet_model_rows_deleted (G_SHEET_MODEL (store), first, n_cases);
}
@@ -246,14 +246,14 @@
g_return_if_fail (data);
- store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE (data);
- g_sheet_model_range_changed (G_SHEET_MODEL(store),
+ g_sheet_model_range_changed (G_SHEET_MODEL (store),
casenum, -1,
psppire_case_file_get_case_count
(store->case_file),
-1);
- g_sheet_model_rows_inserted (G_SHEET_MODEL(store), casenum, 1);
+ g_sheet_model_rows_inserted (G_SHEET_MODEL (store), casenum, 1);
}
@@ -263,9 +263,9 @@
PsppireDataStore *store ;
g_return_if_fail (data);
- store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE (data);
- g_sheet_model_range_changed (G_SHEET_MODEL(store),
+ g_sheet_model_range_changed (G_SHEET_MODEL (store),
casenum, -1,
casenum, -1);
}
@@ -278,11 +278,11 @@
g_return_if_fail (data);
- store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE (data);
- g_sheet_model_columns_deleted (G_SHEET_MODEL(store), var_num, n_vars);
+ g_sheet_model_columns_deleted (G_SHEET_MODEL (store), var_num, n_vars);
- g_sheet_column_columns_changed (G_SHEET_COLUMN(store),
+ g_sheet_column_columns_changed (G_SHEET_COLUMN (store),
var_num, -1);
}
@@ -294,7 +294,7 @@
g_return_if_fail (data);
- store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE (data);
if ( var_num > 0 )
{
@@ -310,10 +310,10 @@
psppire_case_file_insert_values (store->case_file, 1, posn);
- g_sheet_column_columns_changed (G_SHEET_COLUMN(store),
+ g_sheet_column_columns_changed (G_SHEET_COLUMN (store),
var_num, 1);
- g_sheet_model_columns_inserted (G_SHEET_MODEL(store), var_num, 1);
+ g_sheet_model_columns_inserted (G_SHEET_MODEL (store), var_num, 1);
}
@@ -325,7 +325,7 @@
g_return_if_fail (data);
- store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE (data);
psppire_case_file_insert_values (store->case_file, adjustment, posn);
}
@@ -378,34 +378,34 @@
data_store->case_file = psppire_case_file_new (var_cnt);
g_signal_connect (data_store->case_file, "cases-deleted",
- G_CALLBACK(delete_cases_callback),
+ G_CALLBACK (delete_cases_callback),
data_store);
g_signal_connect (data_store->case_file, "case-inserted",
- G_CALLBACK(insert_case_callback),
+ G_CALLBACK (insert_case_callback),
data_store);
g_signal_connect (data_store->case_file, "case-changed",
- G_CALLBACK(changed_case_callback),
+ G_CALLBACK (changed_case_callback),
data_store);
g_signal_connect (dict, "variable-inserted",
- G_CALLBACK(insert_variable_callback),
+ G_CALLBACK (insert_variable_callback),
data_store);
g_signal_connect (dict, "variables-deleted",
- G_CALLBACK(delete_variables_callback),
+ G_CALLBACK (delete_variables_callback),
data_store);
g_signal_connect (dict, "dict-size-changed",
- G_CALLBACK(dict_size_change_callback),
+ G_CALLBACK (dict_size_change_callback),
data_store);
/* The entire model has changed */
- g_sheet_model_range_changed (G_SHEET_MODEL(data_store), -1, -1, -1, -1);
+ g_sheet_model_range_changed (G_SHEET_MODEL (data_store), -1, -1, -1, -1);
- g_sheet_column_columns_changed (G_SHEET_COLUMN(data_store), 0, -1);
+ g_sheet_column_columns_changed (G_SHEET_COLUMN (data_store), 0, -1);
}
static void
@@ -461,7 +461,7 @@
const struct variable *pv ;
const union value *v ;
GString *s;
- PsppireDataStore *store = PSPPIRE_DATA_STORE(model);
+ PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
g_return_val_if_fail (store->dict, NULL);
g_return_val_if_fail (store->case_file, NULL);
@@ -519,7 +519,7 @@
gint row, gint col)
{
- PsppireDataStore *store = PSPPIRE_DATA_STORE(model);
+ PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
union value v;
const struct variable *pv = psppire_dict_get_variable (store->dict, col);
@@ -546,7 +546,7 @@
psppire_data_store_set_string (GSheetModel *model,
const gchar *text, gint row, gint col)
{
- PsppireDataStore *store = PSPPIRE_DATA_STORE(model);
+ PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
const struct variable *pv = psppire_dict_get_variable (store->dict, col);
g_return_val_if_fail (pv, FALSE);
@@ -588,7 +588,7 @@
g_signal_emit (store, signal[FONT_CHANGED], 0);
- g_sheet_model_range_changed (G_SHEET_MODEL(store),
+ g_sheet_model_range_changed (G_SHEET_MODEL (store),
-1, -1, -1, -1);
}
@@ -601,7 +601,7 @@
store->show_labels = show_labels;
- g_sheet_model_range_changed (G_SHEET_MODEL(store),
+ g_sheet_model_range_changed (G_SHEET_MODEL (store),
-1, -1, -1, -1);
}
@@ -630,7 +630,7 @@
return;
- var_cnt = psppire_data_store_get_var_count (G_SHEET_MODEL(store));
+ var_cnt = psppire_data_store_get_var_count (G_SHEET_MODEL (store));
for (i = 0 ; i < psppire_case_file_get_case_count (store->case_file); ++i )
{
@@ -664,9 +664,9 @@
static gint
geometry_get_column_count (const GSheetColumn *geom)
{
- PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
- return MAX(MIN_COLUMNS, psppire_dict_get_var_cnt (ds->dict));
+ return MAX (MIN_COLUMNS, psppire_dict_get_var_cnt (ds->dict));
}
@@ -675,7 +675,7 @@
geometry_get_width (const GSheetColumn *geom, gint unit)
{
const struct variable *pv ;
- PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
if ( unit >= psppire_dict_get_var_cnt (ds->dict) )
return ds->width_of_m * 8 ;
@@ -691,7 +691,7 @@
static void
geometry_set_width (GSheetColumn *geom, gint unit, gint width)
{
- PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
struct variable *pv = psppire_dict_get_variable (ds->dict, unit);
@@ -703,7 +703,7 @@
static GtkJustification
geometry_get_justification (const GSheetColumn *geom, gint unit)
{
- PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
const struct variable *pv ;
@@ -725,7 +725,7 @@
{
gchar *text;
struct variable *pv ;
- PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
if ( unit >= psppire_dict_get_var_cnt (ds->dict) )
return g_locale_to_utf8 (null_var_name, -1, 0, 0, 0);
@@ -741,7 +741,7 @@
static gboolean
geometry_get_sensitivity (const GSheetColumn *geom, gint unit)
{
- PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
return (unit < psppire_dict_get_var_cnt (ds->dict));
}
@@ -765,7 +765,7 @@
static gint
geometry_get_row_count (const GSheetRow *geom, gpointer data)
{
- PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
return TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file);
}
@@ -781,7 +781,7 @@
static gboolean
geometry_get_row_sensitivity (const GSheetRow *geom, gint unit, gpointer data)
{
- PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
return (unit < psppire_case_file_get_case_count (ds->case_file));
@@ -793,7 +793,7 @@
{
gchar *text;
gchar *s;
- PsppireDataStore *ds = PSPPIRE_DATA_STORE(geom);
+ PsppireDataStore *ds = PSPPIRE_DATA_STORE (geom);
if ( unit >
TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file))
Index: psppire-dict.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dict.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- psppire-dict.c 24 Dec 2006 22:49:18 -0000 1.16
+++ psppire-dict.c 24 Dec 2006 23:08:25 -0000 1.17
@@ -110,7 +110,7 @@
signal[VARIABLE_CHANGED] =
g_signal_new ("variable_changed",
- G_TYPE_FROM_CLASS(class),
+ G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@ -123,7 +123,7 @@
signal[VARIABLE_INSERTED] =
g_signal_new ("variable_inserted",
- G_TYPE_FROM_CLASS(class),
+ G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@ -135,7 +135,7 @@
signal[VARIABLES_DELETED] =
g_signal_new ("variables_deleted",
- G_TYPE_FROM_CLASS(class),
+ G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@ -148,7 +148,7 @@
signal[VARIABLE_RESIZED] =
g_signal_new ("dict-size-changed",
- G_TYPE_FROM_CLASS(class),
+ G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@ -244,7 +244,7 @@
{
struct variable *var ;
g_return_if_fail (d);
- g_return_if_fail (G_IS_PSPPIRE_DICT(d));
+ g_return_if_fail (G_IS_PSPPIRE_DICT (d));
if ( ! name )
@@ -264,7 +264,7 @@
gint idx;
g_return_if_fail (d);
g_return_if_fail (d->dict);
- g_return_if_fail (G_IS_PSPPIRE_DICT(d));
+ g_return_if_fail (G_IS_PSPPIRE_DICT (d));
for (idx = 0 ; idx < n ; ++idx )
{
@@ -288,7 +288,7 @@
{
struct variable *var;
g_assert (d);
- g_assert (G_IS_PSPPIRE_DICT(d));
+ g_assert (G_IS_PSPPIRE_DICT (d));
if ( idx < dict_get_var_cnt (d->dict))
@@ -467,7 +467,7 @@
static GtkTreeModelFlags
tree_model_get_flags (GtkTreeModel *model)
{
- g_return_val_if_fail (G_IS_PSPPIRE_DICT(model), (GtkTreeModelFlags) 0);
+ g_return_val_if_fail (G_IS_PSPPIRE_DICT (model), (GtkTreeModelFlags) 0);
return GTK_TREE_MODEL_LIST_ONLY;
}
@@ -482,7 +482,7 @@
static GType
tree_model_column_type (GtkTreeModel *model, gint index)
{
- g_return_val_if_fail (G_IS_PSPPIRE_DICT(model), (GType) 0);
+ g_return_val_if_fail (G_IS_PSPPIRE_DICT (model), (GType) 0);
switch (index)
{
@@ -612,9 +612,9 @@
GtkTreeIter *parent, gint n)
{
PsppireDict *dict;
- g_return_val_if_fail (G_IS_PSPPIRE_DICT(model), FALSE);
+ g_return_val_if_fail (G_IS_PSPPIRE_DICT (model), FALSE);
- dict = PSPPIRE_DICT(model);
+ dict = PSPPIRE_DICT (model);
if ( parent )
return FALSE;
Index: psppire-var-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-var-store.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- psppire-var-store.c 24 Dec 2006 22:49:18 -0000 1.19
+++ psppire-var-store.c 24 Dec 2006 23:08:25 -0000 1.20
@@ -194,7 +194,7 @@
static gboolean
psppire_var_store_is_editable (const GSheetModel *model, gint row, gint column)
{
- PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
+ PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
return psppire_var_store_item_editable (store, row, column);
}
@@ -202,7 +202,7 @@
static const GdkColor *
psppire_var_store_get_foreground (const GSheetModel *model, gint row, gint
column)
{
- PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
+ PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
if ( ! psppire_var_store_item_editable (store, row, column) )
return &store->disabled;
@@ -215,7 +215,7 @@
psppire_var_store_get_font_desc (const GSheetModel *model,
gint row, gint column)
{
- PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
+ PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
return store->font_desc;
}
@@ -262,7 +262,7 @@
static void
var_change_callback (GtkWidget *w, gint n, gpointer data)
{
- GSheetModel *model = G_SHEET_MODEL(data);
+ GSheetModel *model = G_SHEET_MODEL (data);
g_sheet_model_range_changed (model,
n, 0, n, n_COLS);
}
@@ -271,7 +271,7 @@
static void
var_delete_callback (GtkWidget *w, gint first, gint n, gpointer data)
{
- GSheetModel *model = G_SHEET_MODEL(data);
+ GSheetModel *model = G_SHEET_MODEL (data);
g_sheet_model_rows_deleted (model, first, n);
}
@@ -281,7 +281,7 @@
static void
var_insert_callback (GtkWidget *w, gint row, gpointer data)
{
- GSheetModel *model = G_SHEET_MODEL(data);
+ GSheetModel *model = G_SHEET_MODEL (data);
g_sheet_model_rows_inserted (model, row, 1);
}
@@ -303,18 +303,18 @@
var_store->dict = dict;
- g_signal_connect (dict, "variable-changed", G_CALLBACK(var_change_callback),
+ g_signal_connect (dict, "variable-changed", G_CALLBACK (var_change_callback),
var_store);
- g_signal_connect (dict, "variables-deleted", G_CALLBACK(var_delete_callback),
+ g_signal_connect (dict, "variables-deleted", G_CALLBACK
(var_delete_callback),
var_store);
- g_signal_connect (dict, "variable-inserted", G_CALLBACK(var_insert_callback),
+ g_signal_connect (dict, "variable-inserted", G_CALLBACK
(var_insert_callback),
var_store);
/* The entire model has changed */
- g_sheet_model_range_changed (G_SHEET_MODEL(var_store), -1, -1, -1, -1);
+ g_sheet_model_range_changed (G_SHEET_MODEL (var_store), -1, -1, -1, -1);
}
static void
@@ -327,7 +327,7 @@
static gchar *
psppire_var_store_get_string (const GSheetModel *model, gint row, gint column)
{
- PsppireVarStore *store = PSPPIRE_VAR_STORE(model);
+ PsppireVarStore *store = PSPPIRE_VAR_STORE (model);
struct variable *pv;
@@ -349,7 +349,7 @@
{
struct variable *pv ;
- PsppireVarStore *var_store = PSPPIRE_VAR_STORE(model);
+ PsppireVarStore *var_store = PSPPIRE_VAR_STORE (model);
if ( row >= psppire_dict_get_var_cnt (var_store->dict))
return FALSE;
@@ -380,7 +380,7 @@
{
struct variable *pv ;
- PsppireVarStore *var_store = PSPPIRE_VAR_STORE(model);
+ PsppireVarStore *var_store = PSPPIRE_VAR_STORE (model);
if ( row >= psppire_dict_get_var_cnt (var_store->dict))
return FALSE;
@@ -707,7 +707,7 @@
store->font_desc = fd;
- g_sheet_model_range_changed (G_SHEET_MODEL(store), -1, -1, -1, -1);
+ g_sheet_model_range_changed (G_SHEET_MODEL (store), -1, -1, -1, -1);
}
@@ -715,7 +715,7 @@
psppire_var_store_get_row_count (const GSheetModel * model)
{
gint rows = 0;
- PsppireVarStore *vs = PSPPIRE_VAR_STORE(model);
+ PsppireVarStore *vs = PSPPIRE_VAR_STORE (model);
if (vs->dict)
rows = psppire_dict_get_var_cnt (vs->dict);
@@ -729,7 +729,7 @@
geometry_get_row_count (const GSheetRow *geom, gpointer data)
{
gint rows = 0;
- PsppireVarStore *vs = PSPPIRE_VAR_STORE(geom);
+ PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
if (vs->dict)
rows = psppire_dict_get_var_cnt (vs->dict);
@@ -748,7 +748,7 @@
static gboolean
geometry_is_sensitive (const GSheetRow *geom, gint row, gpointer data)
{
- PsppireVarStore *vs = PSPPIRE_VAR_STORE(geom);
+ PsppireVarStore *vs = PSPPIRE_VAR_STORE (geom);
if ( ! vs->dict)
return FALSE;
Index: psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- psppire.c 24 Dec 2006 23:02:33 -0000 1.30
+++ psppire.c 24 Dec 2006 23:08:25 -0000 1.31
@@ -155,12 +155,12 @@
/* connect the signals in the interface */
glade_xml_signal_autoconnect (data_editor_xml);
- var_sheet = GTK_SHEET(get_widget_assert (data_editor_xml,
"variable_sheet"));
- data_sheet = GTK_SHEET(get_widget_assert (data_editor_xml, "data_sheet"));
+ var_sheet = GTK_SHEET (get_widget_assert (data_editor_xml,
"variable_sheet"));
+ data_sheet = GTK_SHEET (get_widget_assert (data_editor_xml, "data_sheet"));
- gtk_sheet_set_model (var_sheet, G_SHEET_MODEL(the_var_store));
+ gtk_sheet_set_model (var_sheet, G_SHEET_MODEL (the_var_store));
- gtk_sheet_set_model (data_sheet, G_SHEET_MODEL(the_data_store));
+ gtk_sheet_set_model (data_sheet, G_SHEET_MODEL (the_data_store));
var_data_selection_init ();
@@ -169,7 +169,7 @@
GList *i;
for ( i = g_list_first (helps); i ; i = g_list_next (i))
- g_signal_connect (GTK_WIDGET(i->data), "clicked", give_help, 0);
+ g_signal_connect (GTK_WIDGET (i->data), "clicked", give_help, 0);
}
#endif
Index: sort-cases-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/sort-cases-dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- sort-cases-dialog.c 24 Dec 2006 22:49:18 -0000 1.5
+++ sort-cases-dialog.c 24 Dec 2006 23:08:25 -0000 1.6
@@ -198,7 +198,7 @@
path = gtk_tree_row_reference_get_path (row_ref);
- gtk_tree_model_get_iter (GTK_TREE_MODEL(dialog->criteria_list), &iter, path);
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (dialog->criteria_list), &iter,
path);
gtk_list_store_remove (dialog->criteria_list, &iter);
@@ -298,33 +298,33 @@
dialog->window = get_widget_assert (xml, "sort-cases-dialog");
- dialog->dict_view = GTK_TREE_VIEW(get_widget_assert
+ dialog->dict_view = GTK_TREE_VIEW (get_widget_assert
(xml, "sort-cases-treeview-dict"));
- dialog->criteria_view = GTK_TREE_VIEW(get_widget_assert
+ dialog->criteria_view = GTK_TREE_VIEW (get_widget_assert
(xml, "sort-cases-treeview-criteria"));
- dialog->arrow = GTK_ARROW(get_widget_assert (xml, "sort-cases-arrow"));
- dialog->button = GTK_BUTTON(get_widget_assert (xml, "sort-cases-button"));
+ dialog->arrow = GTK_ARROW (get_widget_assert (xml, "sort-cases-arrow"));
+ dialog->button = GTK_BUTTON (get_widget_assert (xml, "sort-cases-button"));
dialog->ascending_button =
- GTK_TOGGLE_BUTTON(get_widget_assert (xml, "sort-cases-button-ascending"));
+ GTK_TOGGLE_BUTTON (get_widget_assert (xml, "sort-cases-button-ascending"));
g_signal_connect (dialog->window, "delete-event",
- G_CALLBACK(delete_event_callback), dialog);
+ G_CALLBACK (delete_event_callback), dialog);
g_signal_connect (get_widget_assert (xml, "sort-cases-cancel"),
- "clicked", G_CALLBACK(sort_cases_cancel_callback), dialog);
+ "clicked", G_CALLBACK (sort_cases_cancel_callback), dialog);
g_signal_connect (get_widget_assert (xml, "sort-cases-ok"),
- "clicked", G_CALLBACK(sort_cases_ok_callback), dialog);
+ "clicked", G_CALLBACK (sort_cases_ok_callback), dialog);
g_signal_connect (get_widget_assert (xml, "sort-cases-reset"),
- "clicked", G_CALLBACK(sort_cases_reset_callback), dialog);
+ "clicked", G_CALLBACK (sort_cases_reset_callback), dialog);
g_signal_connect (get_widget_assert (xml, "sort-cases-button"),
- "clicked", G_CALLBACK(sort_cases_button_callback), dialog);
+ "clicked", G_CALLBACK (sort_cases_button_callback), dialog);
{
@@ -352,7 +352,7 @@
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
g_signal_connect (selection, "changed",
- G_CALLBACK(dictionary_selection_changed), dialog);
+ G_CALLBACK (dictionary_selection_changed), dialog);
}
{
@@ -372,11 +372,11 @@
gtk_tree_view_column_set_sizing (dialog->crit_col,
GTK_TREE_VIEW_COLUMN_FIXED);
- gtk_tree_view_append_column (GTK_TREE_VIEW(dialog->criteria_view),
+ gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->criteria_view),
dialog->crit_col);
g_signal_connect (selection, "changed",
- G_CALLBACK(criteria_selection_changed), dialog);
+ G_CALLBACK (criteria_selection_changed), dialog);
}
{
@@ -387,7 +387,7 @@
);
gtk_tree_view_set_model (dialog->criteria_view,
- GTK_TREE_MODEL(dialog->criteria_list));
+ GTK_TREE_MODEL (dialog->criteria_list));
}
dialog->response = GTK_RESPONSE_NONE;
@@ -414,8 +414,8 @@
{
g_assert (! g_main_loop_is_running (dialog->loop));
- gtk_tree_view_set_model (GTK_TREE_VIEW(dialog->dict_view),
- GTK_TREE_MODEL(dict));
+ gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->dict_view),
+ GTK_TREE_MODEL (dict));
gtk_tree_view_column_set_cell_data_func (dialog->crit_col,
@@ -450,7 +450,7 @@
gboolean valid;
gint n = 0;
- GtkTreeModel *model = GTK_TREE_MODEL(list);
+ GtkTreeModel *model = GTK_TREE_MODEL (list);
criteria->crit_cnt = gtk_tree_model_iter_n_children (model, NULL);
Index: syntax-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/syntax-editor.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- syntax-editor.c 23 Dec 2006 23:05:59 -0000 1.6
+++ syntax-editor.c 24 Dec 2006 23:08:25 -0000 1.7
@@ -57,7 +57,7 @@
{
gint response;
GtkWidget *dialog =
- gtk_message_dialog_new (GTK_WINDOW(e->window),
+ gtk_message_dialog_new (GTK_WINDOW (e->window),
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
@@ -65,18 +65,18 @@
e->name ? e->name : _("Untitled")
);
- gtk_dialog_add_button (GTK_DIALOG(dialog),
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_YES,
GTK_RESPONSE_ACCEPT);
- gtk_dialog_add_button (GTK_DIALOG(dialog),
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_NO,
GTK_RESPONSE_REJECT);
- gtk_dialog_add_button (GTK_DIALOG(dialog),
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
- response = gtk_dialog_run (GTK_DIALOG(dialog));
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -111,7 +111,7 @@
GtkWidget *dialog =
gtk_file_chooser_dialog_new (_("Save Syntax"),
- GTK_WINDOW(e->window),
+ GTK_WINDOW (e->window),
GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
@@ -121,14 +121,14 @@
gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) "));
gtk_file_filter_add_pattern (filter, "*.sps");
gtk_file_filter_add_pattern (filter, "*.SPS");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog), filter);
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("All Files"));
gtk_file_filter_add_pattern (filter, "*");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
- gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER(dialog),
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
TRUE);
response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -316,7 +316,7 @@
e->window = get_widget_assert (xml, "syntax_editor");
text_view = get_widget_assert (xml, "syntax_text_view");
- se->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(text_view));
+ se->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
se->lexer = lex_create (the_source_stream);
g_signal_connect (get_widget_assert (xml,"file_new_syntax"),
@@ -494,7 +494,7 @@
GtkWidget *dialog =
gtk_file_chooser_dialog_new (_("Open Syntax"),
- GTK_WINDOW(parent),
+ GTK_WINDOW (parent),
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
@@ -504,7 +504,7 @@
gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) "));
gtk_file_filter_add_pattern (filter, "*.sps");
gtk_file_filter_add_pattern (filter, "*.SPS");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog), filter);
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("All Files"));
Index: var-sheet.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/var-sheet.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- var-sheet.c 24 Dec 2006 23:02:33 -0000 1.16
+++ var-sheet.c 24 Dec 2006 23:08:25 -0000 1.17
@@ -152,13 +152,13 @@
gint *new_row, gint *new_column
)
{
- PsppireVarStore *var_store = PSPPIRE_VAR_STORE(gtk_sheet_get_model (sheet));
+ PsppireVarStore *var_store = PSPPIRE_VAR_STORE (gtk_sheet_get_model (sheet));
gint n_vars = psppire_var_store_get_var_cnt (var_store);
if ( row == n_vars && *new_row >= n_vars)
{
- GtkEntry *entry = GTK_ENTRY(gtk_sheet_get_entry (sheet));
+ GtkEntry *entry = GTK_ENTRY (gtk_sheet_get_entry (sheet));
const gchar *name = gtk_entry_get_text (entry);
@@ -236,19 +236,19 @@
GtkComboBoxEntry *cbe;
gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
cbe =
- GTK_COMBO_BOX_ENTRY(gtk_sheet_get_entry (sheet)->parent);
+ GTK_COMBO_BOX_ENTRY (gtk_sheet_get_entry (sheet)->parent);
if ( ! list_store) list_store = create_label_list (alignments);
- gtk_combo_box_set_model (GTK_COMBO_BOX(cbe),
- GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (cbe),
+ GTK_TREE_MODEL (list_store));
gtk_combo_box_entry_set_text_column (cbe, 0);
- g_signal_connect (G_OBJECT(cbe),"changed",
- G_CALLBACK(change_alignment), pv);
+ g_signal_connect (G_OBJECT (cbe),"changed",
+ G_CALLBACK (change_alignment), pv);
}
break;
case COL_MEASURE:
@@ -257,17 +257,17 @@
GtkComboBoxEntry *cbe;
gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
cbe =
- GTK_COMBO_BOX_ENTRY(gtk_sheet_get_entry (sheet)->parent);
+ GTK_COMBO_BOX_ENTRY (gtk_sheet_get_entry (sheet)->parent);
if ( ! list_store) list_store = create_label_list (measures);
- gtk_combo_box_set_model (GTK_COMBO_BOX(cbe),
- GTK_TREE_MODEL(list_store));
+ gtk_combo_box_set_model (GTK_COMBO_BOX (cbe),
+ GTK_TREE_MODEL (list_store));
gtk_combo_box_entry_set_text_column (cbe, 0);
- g_signal_connect (G_OBJECT(cbe),"changed",
+ g_signal_connect (G_OBJECT (cbe),"changed",
G_CALLBACK (change_measure), pv);
}
break;
@@ -281,7 +281,7 @@
gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
- PSPPIRE_CUSTOM_ENTRY(gtk_sheet_get_entry (sheet));
+ PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
if (!val_labs_dialog )
@@ -289,9 +289,9 @@
val_labs_dialog->pv = pv;
- g_signal_connect_swapped (GTK_OBJECT(customEntry),
+ g_signal_connect_swapped (GTK_OBJECT (customEntry),
"clicked",
- GTK_SIGNAL_FUNC(val_labs_dialog_show),
+ GTK_SIGNAL_FUNC (val_labs_dialog_show),
val_labs_dialog);
}
break;
@@ -303,16 +303,16 @@
gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
- PSPPIRE_CUSTOM_ENTRY(gtk_sheet_get_entry (sheet));
+ PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
if (!missing_val_dialog )
missing_val_dialog = missing_val_dialog_create (xml);
missing_val_dialog->pv = psppire_var_store_get_var (var_store, row);
- g_signal_connect_swapped (GTK_OBJECT(customEntry),
+ g_signal_connect_swapped (GTK_OBJECT (customEntry),
"clicked",
- GTK_SIGNAL_FUNC(missing_val_dialog_show),
+ GTK_SIGNAL_FUNC (missing_val_dialog_show),
missing_val_dialog);
}
break;
@@ -326,7 +326,7 @@
gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
- PSPPIRE_CUSTOM_ENTRY(gtk_sheet_get_entry (sheet));
+ PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
/* Popup the Variable Type dialog box */
@@ -336,9 +336,9 @@
var_type_dialog->pv = pv;
- g_signal_connect_swapped (GTK_OBJECT(customEntry),
+ g_signal_connect_swapped (GTK_OBJECT (customEntry),
"clicked",
- GTK_SIGNAL_FUNC(var_type_dialog_show),
+ GTK_SIGNAL_FUNC (var_type_dialog_show),
var_type_dialog);
}
break;
@@ -385,9 +385,9 @@
gtk_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
spinButton =
- GTK_SPIN_BUTTON(gtk_sheet_get_entry (sheet));
+ GTK_SPIN_BUTTON (gtk_sheet_get_entry (sheet));
- gtk_spin_button_set_adjustment (spinButton,
GTK_ADJUSTMENT(adj));
+ gtk_spin_button_set_adjustment (spinButton, GTK_ADJUSTMENT
(adj));
gtk_spin_button_set_digits (spinButton, 0);
}
}
@@ -424,8 +424,8 @@
g_assert (the_var_store);
- sheet = gtk_sheet_new (G_SHEET_ROW(the_var_store),
- G_SHEET_COLUMN(geo),
+ sheet = gtk_sheet_new (G_SHEET_ROW (the_var_store),
+ G_SHEET_COLUMN (geo),
"variable sheet", 0);
@@ -441,7 +441,7 @@
GTK_SIGNAL_FUNC (traverse_cell_callback), 0);
- gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL(the_var_store));
+ gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_var_store));
/* Since this happens inside glade_xml_new, we must prevent strings from
@@ -450,10 +450,10 @@
bind_textdomain_codeset (PACKAGE, nl_langinfo (CODESET));
for (i = 0 ; i < n_COLS ; ++i )
{
- g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN(geo), i,
+ g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN (geo), i,
gettext (column_def[i].label));
- g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN(geo), i,
+ g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
column_def[i].width);
}
bind_textdomain_codeset (PACKAGE, codeset);
Index: var-type-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/var-type-dialog.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- var-type-dialog.c 24 Dec 2006 22:49:18 -0000 1.13
+++ var-type-dialog.c 24 Dec 2006 23:08:25 -0000 1.14
@@ -226,11 +226,11 @@
g_assert (dialog);
text = g_strdup_printf ("%d", dialog->fmt_l.w);
- gtk_entry_set_text (GTK_ENTRY(dialog->entry_width), text);
+ gtk_entry_set_text (GTK_ENTRY (dialog->entry_width), text);
g_free (text);
text = g_strdup_printf ("%d", dialog->fmt_l.d);
- gtk_entry_set_text (GTK_ENTRY(dialog->entry_decimals), text);
+ gtk_entry_set_text (GTK_ENTRY (dialog->entry_decimals), text);
g_free (text);
}
@@ -246,17 +246,17 @@
if ( dialog->active_button != BUTTON_CUSTOM )
return;
- text = gtk_entry_get_text (GTK_ENTRY(dialog->entry_decimals));
+ text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_decimals));
dialog->fmt_l.d = atoi (text);
- text = gtk_entry_get_text (GTK_ENTRY(dialog->entry_width));
+ text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_width));
dialog->fmt_l.w = atoi (text);
msg_disable ();
if ( ! fmt_check_output (&dialog->fmt_l))
{
- gtk_label_set_text (GTK_LABEL(dialog->label_psample), "---");
- gtk_label_set_text (GTK_LABEL(dialog->label_nsample), "---");
+ gtk_label_set_text (GTK_LABEL (dialog->label_psample), "---");
+ gtk_label_set_text (GTK_LABEL (dialog->label_nsample), "---");
}
else
{
@@ -265,12 +265,12 @@
v.f = 1234.56;
sample_text = value_to_text (v, dialog->fmt_l);
- gtk_label_set_text (GTK_LABEL(dialog->label_psample), sample_text);
+ gtk_label_set_text (GTK_LABEL (dialog->label_psample), sample_text);
g_free (sample_text);
v.f = -v.f;
sample_text = value_to_text (v, dialog->fmt_l);
- gtk_label_set_text (GTK_LABEL(dialog->label_nsample), sample_text);
+ gtk_label_set_text (GTK_LABEL (dialog->label_nsample), sample_text);
g_free (sample_text);
}
msg_enable ();
@@ -334,8 +334,8 @@
dialog->window = get_widget_assert (xml,"var_type_dialog");
- gtk_window_set_transient_for (GTK_WINDOW(dialog->window),
- GTK_WINDOW(get_widget_assert (xml,
"data_editor")));
+ gtk_window_set_transient_for (GTK_WINDOW (dialog->window),
+ GTK_WINDOW (get_widget_assert (xml,
"data_editor")));
dialog->radioButton[BUTTON_NUMERIC] =
get_widget_assert (xml,"radiobutton1");
@@ -371,10 +371,10 @@
dialog->dollar_window = get_widget_assert (xml, "dollar_window");
dialog->dollar_treeview =
- GTK_TREE_VIEW(get_widget_assert (xml, "dollar_treeview"));
+ GTK_TREE_VIEW (get_widget_assert (xml, "dollar_treeview"));
dialog->custom_treeview =
- GTK_TREE_VIEW(get_widget_assert (xml, "custom_treeview"));
+ GTK_TREE_VIEW (get_widget_assert (xml, "custom_treeview"));
dialog->ok = get_widget_assert (xml,"var_type_ok");
@@ -394,7 +394,7 @@
upleasant resizing effects */
GtkSizeGroup *sizeGroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- gtk_container_foreach (GTK_CONTAINER(get_widget_assert (xml, "middle_box")),
+ gtk_container_foreach (GTK_CONTAINER (get_widget_assert (xml, "middle_box")),
add_to_group, sizeGroup);
@@ -403,14 +403,14 @@
tgs[i].dialog = dialog;
tgs[i].button = i;
g_signal_connect (dialog->radioButton[i], "toggled",
- G_CALLBACK(on_toggle_1), &tgs[i]);
+ G_CALLBACK (on_toggle_1), &tgs[i]);
g_signal_connect (dialog->radioButton[i], "toggled",
- G_CALLBACK(on_toggle_2), dialog);
+ G_CALLBACK (on_toggle_2), dialog);
}
/* Populate the date format tree view */
- dialog->date_format_treeview = GTK_TREE_VIEW(get_widget_assert (xml,
+ dialog->date_format_treeview = GTK_TREE_VIEW (get_widget_assert (xml,
"date_format_list_view"));
renderer = gtk_cell_renderer_text_new ();
@@ -436,13 +436,13 @@
-1);
}
- gtk_tree_view_set_model (GTK_TREE_VIEW(dialog->date_format_treeview),
- GTK_TREE_MODEL(list_store));
+ gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->date_format_treeview),
+ GTK_TREE_MODEL (list_store));
g_object_unref (list_store);
- g_signal_connect (GTK_OBJECT(dialog->date_format_treeview), "cursor-changed",
- GTK_SIGNAL_FUNC(set_format_from_treeview), dialog);
+ g_signal_connect (GTK_OBJECT (dialog->date_format_treeview),
"cursor-changed",
+ GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
/* populate the dollar treeview */
@@ -473,18 +473,18 @@
free (template);
}
- gtk_tree_view_set_model (GTK_TREE_VIEW(dialog->dollar_treeview),
- GTK_TREE_MODEL(list_store));
+ gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->dollar_treeview),
+ GTK_TREE_MODEL (list_store));
g_object_unref (list_store);
- g_signal_connect (GTK_OBJECT(dialog->dollar_treeview),
+ g_signal_connect (GTK_OBJECT (dialog->dollar_treeview),
"cursor-changed",
- GTK_SIGNAL_FUNC(set_format_from_treeview), dialog);
+ GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
- g_signal_connect_swapped (GTK_OBJECT(dialog->dollar_treeview),
+ g_signal_connect_swapped (GTK_OBJECT (dialog->dollar_treeview),
"cursor-changed",
- GTK_SIGNAL_FUNC(update_width_decimals), dialog);
+ GTK_SIGNAL_FUNC (update_width_decimals), dialog);
/* populate the custom treeview */
@@ -516,34 +516,34 @@
-1);
}
- gtk_tree_view_set_model (GTK_TREE_VIEW(dialog->custom_treeview),
- GTK_TREE_MODEL(list_store));
+ gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->custom_treeview),
+ GTK_TREE_MODEL (list_store));
g_object_unref (list_store);
- g_signal_connect (GTK_OBJECT(dialog->custom_treeview),
+ g_signal_connect (GTK_OBJECT (dialog->custom_treeview),
"cursor-changed",
- GTK_SIGNAL_FUNC(set_format_type_from_treeview), dialog);
+ GTK_SIGNAL_FUNC (set_format_type_from_treeview), dialog);
- g_signal_connect (GTK_OBJECT(dialog->custom_treeview),
+ g_signal_connect (GTK_OBJECT (dialog->custom_treeview),
"cursor-changed",
- GTK_SIGNAL_FUNC(preview_custom), dialog);
+ GTK_SIGNAL_FUNC (preview_custom), dialog);
- g_signal_connect (GTK_OBJECT(dialog->entry_width),
+ g_signal_connect (GTK_OBJECT (dialog->entry_width),
"changed",
- GTK_SIGNAL_FUNC(preview_custom), dialog);
+ GTK_SIGNAL_FUNC (preview_custom), dialog);
- g_signal_connect (GTK_OBJECT(dialog->entry_decimals),
+ g_signal_connect (GTK_OBJECT (dialog->entry_decimals),
"changed",
- GTK_SIGNAL_FUNC(preview_custom), dialog);
+ GTK_SIGNAL_FUNC (preview_custom), dialog);
/* Connect the OK button */
- g_signal_connect (dialog->ok, "clicked", G_CALLBACK(on_var_type_ok_clicked),
+ g_signal_connect (dialog->ok, "clicked", G_CALLBACK (on_var_type_ok_clicked),
dialog);
@@ -557,7 +557,7 @@
void
var_type_dialog_set_active_button (struct var_type_dialog *dialog, gint b)
{
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dialog->radioButton[b]),
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->radioButton[b]),
TRUE);
dialog->active_button = b;
}
@@ -667,12 +667,12 @@
g_string_printf (str, "%d", write_spec->d);
- gtk_entry_set_text (GTK_ENTRY(dialog->entry_decimals),
+ gtk_entry_set_text (GTK_ENTRY (dialog->entry_decimals),
str->str);
g_string_printf (str, "%d", write_spec->w);
- gtk_entry_set_text (GTK_ENTRY(dialog->entry_width),
+ gtk_entry_set_text (GTK_ENTRY (dialog->entry_width),
str->str);
g_string_free (str, TRUE);
@@ -776,10 +776,10 @@
{
gint width = atoi (gtk_entry_get_text
- (GTK_ENTRY(dialog->entry_width)));
+ (GTK_ENTRY (dialog->entry_width)));
gint decimals = atoi (gtk_entry_get_text
- (GTK_ENTRY(dialog->entry_decimals)));
+ (GTK_ENTRY (dialog->entry_decimals)));
gint new_type = VAR_NUMERIC;
gint new_width = 0;
Index: window-manager.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/window-manager.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- window-manager.c 23 Dec 2006 09:03:45 -0000 1.1
+++ window-manager.c 24 Dec 2006 23:08:25 -0000 1.2
@@ -45,7 +45,7 @@
set_window_name (e, name);
- gtk_window_set_icon_from_file (GTK_WINDOW(e->window),
+ gtk_window_set_icon_from_file (GTK_WINDOW (e->window),
PKGDATADIR "/psppicon.png", 0);
g_signal_connect (e->window, "destroy", G_CALLBACK (deregister), NULL);
@@ -86,7 +86,7 @@
g_assert_not_reached ();
}
- gtk_window_set_title (GTK_WINDOW(e->window), title);
+ gtk_window_set_title (GTK_WINDOW (e->window), title);
g_free (title);
}
@@ -114,7 +114,7 @@
}
g_free (basename);
- gtk_window_set_title (GTK_WINDOW(e->window), title);
+ gtk_window_set_title (GTK_WINDOW (e->window), title);
g_free (title);
}
@@ -123,7 +123,7 @@
GtkWindow *
window_toplevel (const struct editor_window *e)
{
- return GTK_WINDOW(e->window);
+ return GTK_WINDOW (e->window);
}
const gchar *
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/src/ui/gui about.c customentry.c data-edit...,
John Darrington <=