projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e10bd21
)
Whitespace changes only.
author
John Darrington
<john@darrington.wattle.id.au>
Sun, 24 Dec 2006 23:08:25 +0000
(23:08 +0000)
committer
John Darrington
<john@darrington.wattle.id.au>
Sun, 24 Dec 2006 23:08:25 +0000
(23:08 +0000)
16 files changed:
src/ui/gui/about.c
patch
|
blob
|
history
src/ui/gui/customentry.c
patch
|
blob
|
history
src/ui/gui/data-editor.c
patch
|
blob
|
history
src/ui/gui/data-sheet.c
patch
|
blob
|
history
src/ui/gui/message-dialog.c
patch
|
blob
|
history
src/ui/gui/missing-val-dialog.c
patch
|
blob
|
history
src/ui/gui/psppire-case-file.c
patch
|
blob
|
history
src/ui/gui/psppire-data-store.c
patch
|
blob
|
history
src/ui/gui/psppire-dict.c
patch
|
blob
|
history
src/ui/gui/psppire-var-store.c
patch
|
blob
|
history
src/ui/gui/psppire.c
patch
|
blob
|
history
src/ui/gui/sort-cases-dialog.c
patch
|
blob
|
history
src/ui/gui/syntax-editor.c
patch
|
blob
|
history
src/ui/gui/var-sheet.c
patch
|
blob
|
history
src/ui/gui/var-type-dialog.c
patch
|
blob
|
history
src/ui/gui/window-manager.c
patch
|
blob
|
history
diff --git
a/src/ui/gui/about.c
b/src/ui/gui/about.c
index 397ff5b827ed169f86fc723c7cb31f2becde6559..7526f968170e065ca92cc072450c860b883edd92 100644
(file)
--- a/
src/ui/gui/about.c
+++ b/
src/ui/gui/about.c
@@
-15,17
+15,17
@@
about_new (GtkMenuItem *m, GtkWindow *parent)
GdkPixbuf *pb =
gdk_pixbuf_new_from_file_at_size (PKGDATADIR "/pspplogo.png", 64, 64, 0);
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);
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);
gtk_window_set_modal (GTK_WINDOW (about), TRUE);
diff --git
a/src/ui/gui/customentry.c
b/src/ui/gui/customentry.c
index b2c25aa395c240ed1b276e518de5092a1a05a489..2d8f9a0e29b8e91ea9f0f4a452625b0861d17d9f 100644
(file)
--- a/
src/ui/gui/customentry.c
+++ b/
src/ui/gui/customentry.c
@@
-256,7
+256,7
@@
static gint
psppire_custom_entry_expose (GtkWidget *widget,
GdkEventExpose *event)
{
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);
g_return_val_if_fail (PSPPIRE_IS_CUSTOM_ENTRY (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@@
-342,7
+342,7
@@
psppire_custom_entry_class_init (PsppireCustomEntryClass *klass)
custom_entry_signals[CLICKED] =
g_signal_new ("clicked",
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,
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
diff --git
a/src/ui/gui/data-editor.c
b/src/ui/gui/data-editor.c
index b35f3f1af8242961efbcf0a104a7ad0ddae6a83f..d37e52ebf8b5cf2e0a27a9da73a711e6e055b97b 100644
(file)
--- a/
src/ui/gui/data-editor.c
+++ b/
src/ui/gui/data-editor.c
@@
-195,10
+195,10
@@
click2row (GtkWidget *w, gint row, gpointer data)
data_editor_select_sheet (de, PAGE_DATA_SHEET);
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);
¤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;
}
return FALSE;
}
@@
-217,10
+217,10
@@
click2column (GtkWidget *w, gint col, gpointer data)
data_editor_select_sheet (de, PAGE_VAR_SHEET);
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);
¤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;
}
return FALSE;
}
@@
-309,18
+309,18
@@
open_data_window (GtkMenuItem *menuitem, gpointer parent)
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_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");
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, "*");
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 {
do {
@@
-404,10
+404,10
@@
fonts_activate (GtkMenuItem *menuitem, gpointer data)
if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) )
{
GtkSheet *data_sheet =
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 =
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));
PsppireDataStore *ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
diff --git
a/src/ui/gui/data-sheet.c
b/src/ui/gui/data-sheet.c
index 9a3c0c520062c0f5cfb941384133a748870d12d7..0998de055a15e3b848f863e85e8a50d4cc4aa1c8 100644
(file)
--- a/
src/ui/gui/data-sheet.c
+++ b/
src/ui/gui/data-sheet.c
@@
-49,7
+49,7
@@
traverse_callback (GtkSheet * sheet,
gint n_vars;
PsppireDataStore *data_store =
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);
g_assert (data_store);
@@
-87,7
+87,7
@@
update_data_ref_entry (const GtkSheet *sheet, gint row, gint col)
/* The entry where the reference to the current cell is displayed */
GtkEntry *cell_ref_entry;
/* 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 =
if (data_store)
{
const struct variable *pv =
@@
-102,7
+102,7
@@
update_data_ref_entry (const GtkSheet *sheet, gint row, gint col)
text = g_strdup_printf ("%d: %s", row,
pv ? var_get_name (pv) : "");
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);
"cell_ref_entry"));
s = pspp_locale_to_utf8 (text, -1, 0);
@@
-139,10
+139,10
@@
calc_m_width (GtkWidget *widget, const PangoFontDescription *font_desc)
pango_layout_get_extents (layout, NULL, &rect);
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
@@
void
font_change_callback (GObject *obj, gpointer data)
{
GtkWidget *sheet = data;
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);
}
ds->width_of_m = calc_m_width (sheet, ds->font_desc);
}
@@
-162,8
+162,8
@@
psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
{
GtkWidget *sheet;
{
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);
the_data_store->width_of_m = calc_m_width (sheet, the_data_store->font_desc);
@@
-178,10
+178,10
@@
psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
g_signal_connect (G_OBJECT (the_data_store), "font-changed",
G_CALLBACK (font_change_callback), sheet);
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);
gtk_widget_show (sheet);
diff --git
a/src/ui/gui/message-dialog.c
b/src/ui/gui/message-dialog.c
index 9afbee5bd433486dd82bb729570de612e153739c..227d3528de221ddc6a30f487d50722797e78c400 100644
(file)
--- a/
src/ui/gui/message-dialog.c
+++ b/
src/ui/gui/message-dialog.c
@@
-138,15
+138,15
@@
popup_message (const struct msg *m)
GTK_BUTTONS_CLOSE,
msg);
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);
_("%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);
}
gtk_widget_destroy (dialog);
}
diff --git
a/src/ui/gui/missing-val-dialog.c
b/src/ui/gui/missing-val-dialog.c
index 351279883542e8206be470e549b59ba45a6cee65..f622d91ff9ed31333151abedbe52e3699b0cd025 100644
(file)
--- a/
src/ui/gui/missing-val-dialog.c
+++ b/
src/ui/gui/missing-val-dialog.c
@@
-67,11
+67,11
@@
err_dialog (const gchar *msg, GtkWindow *window)
hbox = gtk_hbox_new (FALSE, 10);
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);
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);
}
gtk_widget_show_all (dialog);
}
@@
-94,7
+94,7
@@
missing_val_dialog_accept (GtkWidget *w, gpointer data)
for (i = 0 ; i < 3 ; ++i )
{
gchar *text =
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 )
union value v;
if ( !text || strlen (g_strstrip (text)) == 0 )
@@
-115,7
+115,7
@@
missing_val_dialog_accept (GtkWidget *w, gpointer data)
if ( nvals == 0 || badvals > 0 )
{
err_dialog (_("Incorrect value for variable type"),
if ( nvals == 0 || badvals > 0 )
{
err_dialog (_("Incorrect value for variable type"),
- GTK_WINDOW(dialog->window));
+ GTK_WINDOW
(dialog->window));
return ;
}
}
return ;
}
}
@@
-126,8
+126,8
@@
missing_val_dialog_accept (GtkWidget *w, gpointer data)
union value low_val ;
union value high_val;
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)
&&
if ( text_to_value (low_text, &low_val, *write_spec)
&&
@@
-136,19
+136,19
@@
missing_val_dialog_accept (GtkWidget *w, gpointer data)
if ( low_val.f > high_val.f )
{
err_dialog (_("Incorrect range specification"),
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"),
return ;
}
}
else
{
err_dialog (_("Incorrect range specification"),
- GTK_WINDOW(dialog->window));
+ GTK_WINDOW
(dialog->window));
return;
}
discrete_text =
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);
mv_clear (&dialog->mvl);
mv_add_num_range (&dialog->mvl, low_val.f, high_val.f);
@@
-160,7
+160,7
@@
missing_val_dialog_accept (GtkWidget *w, gpointer data)
*write_spec))
{
err_dialog (_("Incorrect value for variable type"),
*write_spec))
{
err_dialog (_("Incorrect value for variable type"),
- GTK_WINDOW(dialog->window) );
+ GTK_WINDOW
(dialog->window) );
g_free (discrete_text);
return;
}
g_free (discrete_text);
return;
}
@@
-216,15
+216,15
@@
missing_val_dialog_create (GladeXML *xml)
dialog->window = get_widget_assert (xml, "missing_values_dialog");
gtk_window_set_transient_for
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"),
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"),
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");
dialog->mv[0] = get_widget_assert (xml, "mv0");
@@
-237,20
+237,20
@@
missing_val_dialog_create (GladeXML *xml)
dialog->button_none =
dialog->button_none =
- GTK_TOGGLE_BUTTON(get_widget_assert (xml, "no_missing"));
+ GTK_TOGGLE_BUTTON
(get_widget_assert (xml, "no_missing"));
dialog->button_discrete =
dialog->button_discrete =
- GTK_TOGGLE_BUTTON(get_widget_assert (xml, "discrete_missing"));
+ GTK_TOGGLE_BUTTON
(get_widget_assert (xml, "discrete_missing"));
dialog->button_range =
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;
}
return dialog;
}
@@
-270,20
+270,20
@@
missing_val_dialog_show (struct missing_val_dialog *dialog)
write_spec = var_get_write_format (dialog->pv);
/* Blank all entry boxes and make them insensitive */
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 (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 )
{
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);
}
gtk_widget_set_sensitive (dialog->mv[i], FALSE);
}
@@
-297,8
+297,8
@@
missing_val_dialog_show (struct missing_val_dialog *dialog)
low_text = value_to_text (low, *write_spec);
high_text = value_to_text (high, *write_spec);
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);
g_free (low_text);
g_free (high_text);
@@
-308,7
+308,7
@@
missing_val_dialog_show (struct missing_val_dialog *dialog)
union value value;
mv_peek_value (&dialog->mvl, &value, 0);
text = value_to_text (value, *write_spec);
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);
}
g_free (text);
}
@@
-331,7
+331,7
@@
missing_val_dialog_show (struct missing_val_dialog *dialog)
mv_peek_value (&dialog->mvl, &value, i);
text = value_to_text (value, *write_spec);
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);
g_free (text);
}
gtk_widget_set_sensitive (dialog->mv[i], TRUE);
diff --git
a/src/ui/gui/psppire-case-file.c
b/src/ui/gui/psppire-case-file.c
index cadcffd758b920dc17788de68d216109b94c7ee8..6e0766b95249f0f24a7937899cef6906cf0ac16c 100644
(file)
--- a/
src/ui/gui/psppire-case-file.c
+++ b/
src/ui/gui/psppire-case-file.c
@@
-94,7
+94,7
@@
psppire_case_file_class_init (PsppireCaseFileClass *class)
signal[CASE_CHANGED] =
g_signal_new ("case_changed",
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,
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@
-106,7
+106,7
@@
psppire_case_file_class_init (PsppireCaseFileClass *class)
signal[CASE_INSERTED] =
g_signal_new ("case_inserted",
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,
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@
-118,7
+118,7
@@
psppire_case_file_class_init (PsppireCaseFileClass *class)
signal[CASES_DELETED] =
g_signal_new ("cases_deleted",
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,
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@
-188,7
+188,7
@@
psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_cases, gint first)
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->flexifile, FALSE);
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);
g_signal_emit (cf, signal[CASES_DELETED], 0, n_cases, first);
@@
-206,7
+206,7
@@
psppire_case_file_insert_case (PsppireCaseFile *cf,
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->flexifile, FALSE);
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);
if ( result )
g_signal_emit (cf, signal[CASE_INSERTED], 0, posn);
@@
-263,7
+263,7
@@
psppire_case_file_get_value (const PsppireCaseFile *cf, gint casenum, gint idx)
g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), NULL);
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);
v = case_data_idx (&c, idx);
case_destroy (&c);
@@
-292,13
+292,13
@@
psppire_case_file_set_value (PsppireCaseFile *cf, gint casenum, gint idx,
g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), FALSE);
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
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);
/* Cast away const in flagrant abuse of the casefile */
memcpy ((union value *)case_data_idx (&cc, idx), v, bytes);
@@
-322,7
+322,7
@@
psppire_case_file_data_in (PsppireCaseFile *cf, gint casenum, gint idx,
g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), FALSE);
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 */
return FALSE;
/* Cast away const in flagrant abuse of the casefile */
@@
-376,7
+376,7
@@
psppire_case_file_insert_values (PsppireCaseFile *cf,
return TRUE;
}
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.
}
/* Fills C with the CASENUMth case.
@@
-389,5
+389,5
@@
psppire_case_file_get_case (const PsppireCaseFile *cf, gint casenum,
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->flexifile, FALSE);
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);
}
}
diff --git
a/src/ui/gui/psppire-data-store.c
b/src/ui/gui/psppire-data-store.c
index 9e973ce349b21d3db4e514ed7a4c7ec3d576cd08..d75348584211afe2e72b3dbe5da8f8975c6d7fc9 100644
(file)
--- a/
src/ui/gui/psppire-data-store.c
+++ b/
src/ui/gui/psppire-data-store.c
@@
-154,7
+154,7
@@
psppire_data_store_class_init (PsppireDataStoreClass *class)
signal[FONT_CHANGED] =
g_signal_new ("font_changed",
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,
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@
-168,7
+168,7
@@
psppire_data_store_class_init (PsppireDataStoreClass *class)
static gint
psppire_data_store_get_var_count (const GSheetModel *model)
{
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);
}
return psppire_dict_get_var_cnt (store->dict);
}
@@
-176,7
+176,7
@@
psppire_data_store_get_var_count (const GSheetModel *model)
static gint
psppire_data_store_get_case_count (const GSheetModel *model)
{
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);
}
return psppire_case_file_get_case_count (store->case_file);
}
@@
-194,7
+194,7
@@
const PangoFontDescription *
psppire_data_store_get_font_desc (const GSheetModel *model,
gint row, gint column)
{
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;
}
return store->font_desc;
}
@@
-231,11
+231,11
@@
delete_cases_callback (GtkWidget *w, gint first, gint n_cases, gpointer data)
g_return_if_fail (data);
g_return_if_fail (data);
- store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE
(data);
g_assert (first >= 0);
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
@@
insert_case_callback (GtkWidget *w, gint casenum, gpointer data)
g_return_if_fail (data);
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);
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
@@
changed_case_callback (GtkWidget *w, gint casenum, gpointer data)
PsppireDataStore *store ;
g_return_if_fail (data);
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);
}
casenum, -1,
casenum, -1);
}
@@
-278,11
+278,11
@@
delete_variables_callback (GObject *obj, gint var_num, gint n_vars, gpointer dat
g_return_if_fail (data);
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);
}
var_num, -1);
}
@@
-294,7
+294,7
@@
insert_variable_callback (GObject *obj, gint var_num, gpointer data)
g_return_if_fail (data);
g_return_if_fail (data);
- store = PSPPIRE_DATA_STORE(data);
+ store = PSPPIRE_DATA_STORE
(data);
if ( var_num > 0 )
{
if ( var_num > 0 )
{
@@
-310,10
+310,10
@@
insert_variable_callback (GObject *obj, gint var_num, gpointer data)
psppire_case_file_insert_values (store->case_file, 1, posn);
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);
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
@@
dict_size_change_callback (GObject *obj,
g_return_if_fail (data);
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);
}
psppire_case_file_insert_values (store->case_file, adjustment, posn);
}
@@
-378,34
+378,34
@@
psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict *di
data_store->case_file = psppire_case_file_new (var_cnt);
g_signal_connect (data_store->case_file, "cases-deleted",
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",
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",
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",
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",
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",
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 */
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
}
static void
@@
-461,7
+461,7
@@
psppire_data_store_get_string (const GSheetModel *model, gint row, gint column)
const struct variable *pv ;
const union value *v ;
GString *s;
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);
g_return_val_if_fail (store->dict, NULL);
g_return_val_if_fail (store->case_file, NULL);
@@
-519,7
+519,7
@@
psppire_data_store_clear_datum (GSheetModel *model,
gint row, gint col)
{
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);
union value v;
const struct variable *pv = psppire_dict_get_variable (store->dict, col);
@@
-546,7
+546,7
@@
static gboolean
psppire_data_store_set_string (GSheetModel *model,
const gchar *text, gint row, gint col)
{
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);
const struct variable *pv = psppire_dict_get_variable (store->dict, col);
g_return_val_if_fail (pv, FALSE);
@@
-588,7
+588,7
@@
psppire_data_store_set_font (PsppireDataStore *store,
g_signal_emit (store, signal[FONT_CHANGED], 0);
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);
}
-1, -1, -1, -1);
}
@@
-601,7
+601,7
@@
psppire_data_store_show_labels (PsppireDataStore *store, gboolean show_labels)
store->show_labels = show_labels;
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);
}
-1, -1, -1, -1);
}
@@
-630,7
+630,7
@@
psppire_data_store_create_system_file (PsppireDataStore *store,
return;
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 )
{
for (i = 0 ; i < psppire_case_file_get_case_count (store->case_file); ++i )
{
@@
-664,9
+664,9
@@
psppire_data_store_clear (PsppireDataStore *data_store)
static gint
geometry_get_column_count (const GSheetColumn *geom)
{
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
@@
static gint
geometry_get_width (const GSheetColumn *geom, gint unit)
{
const struct variable *pv ;
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 ;
if ( unit >= psppire_dict_get_var_cnt (ds->dict) )
return ds->width_of_m * 8 ;
@@
-691,7
+691,7
@@
geometry_get_width (const GSheetColumn *geom, gint unit)
static void
geometry_set_width (GSheetColumn *geom, gint unit, gint width)
{
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);
struct variable *pv = psppire_dict_get_variable (ds->dict, unit);
@@
-703,7
+703,7
@@
geometry_set_width (GSheetColumn *geom, gint unit, gint width)
static GtkJustification
geometry_get_justification (const GSheetColumn *geom, gint unit)
{
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 ;
const struct variable *pv ;
@@
-725,7
+725,7
@@
geometry_get_column_button_label (const GSheetColumn *geom, gint unit)
{
gchar *text;
struct variable *pv ;
{
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);
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
@@
geometry_get_column_button_label (const GSheetColumn *geom, gint unit)
static gboolean
geometry_get_sensitivity (const GSheetColumn *geom, gint unit)
{
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));
}
return (unit < psppire_dict_get_var_cnt (ds->dict));
}
@@
-765,7
+765,7
@@
psppire_data_store_sheet_column_init (GSheetColumnIface *iface)
static gint
geometry_get_row_count (const GSheetRow *geom, gpointer data)
{
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);
}
return TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file);
}
@@
-781,7
+781,7
@@
geometry_get_height (const GSheetRow *geom, gint unit, gpointer data)
static gboolean
geometry_get_row_sensitivity (const GSheetRow *geom, gint unit, gpointer data)
{
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));
return (unit < psppire_case_file_get_case_count (ds->case_file));
@@
-793,7
+793,7
@@
geometry_get_row_button_label (const GSheetRow *geom, gint unit, gpointer data)
{
gchar *text;
gchar *s;
{
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))
if ( unit >
TRAILING_ROWS + psppire_case_file_get_case_count (ds->case_file))
diff --git
a/src/ui/gui/psppire-dict.c
b/src/ui/gui/psppire-dict.c
index 81bffe5cc9fa73623fbf491fb10663a82d51c3d8..5cf2f4faafc78de385dfd1bd67ae69a35b77ee6c 100644
(file)
--- a/
src/ui/gui/psppire-dict.c
+++ b/
src/ui/gui/psppire-dict.c
@@
-110,7
+110,7
@@
psppire_dict_class_init (PsppireDictClass *class)
signal[VARIABLE_CHANGED] =
g_signal_new ("variable_changed",
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,
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@
-123,7
+123,7
@@
psppire_dict_class_init (PsppireDictClass *class)
signal[VARIABLE_INSERTED] =
g_signal_new ("variable_inserted",
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,
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@
-135,7
+135,7
@@
psppire_dict_class_init (PsppireDictClass *class)
signal[VARIABLES_DELETED] =
g_signal_new ("variables_deleted",
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,
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@
-148,7
+148,7
@@
psppire_dict_class_init (PsppireDictClass *class)
signal[VARIABLE_RESIZED] =
g_signal_new ("dict-size-changed",
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,
G_SIGNAL_RUN_FIRST,
0,
NULL, NULL,
@@
-244,7
+244,7
@@
psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name)
{
struct variable *var ;
g_return_if_fail (d);
{
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 )
if ( ! name )
@@
-264,7
+264,7
@@
psppire_dict_delete_variables (PsppireDict *d, gint first, gint n)
gint idx;
g_return_if_fail (d);
g_return_if_fail (d->dict);
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 )
{
for (idx = 0 ; idx < n ; ++idx )
{
@@
-288,7
+288,7
@@
psppire_dict_set_name (PsppireDict* d, gint idx, const gchar *name)
{
struct variable *var;
g_assert (d);
{
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))
if ( idx < dict_get_var_cnt (d->dict))
@@
-467,7
+467,7
@@
dictionary_tree_model_init (GtkTreeModelIface *iface)
static GtkTreeModelFlags
tree_model_get_flags (GtkTreeModel *model)
{
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;
}
return GTK_TREE_MODEL_LIST_ONLY;
}
@@
-482,7
+482,7
@@
tree_model_n_columns (GtkTreeModel *model)
static GType
tree_model_column_type (GtkTreeModel *model, gint index)
{
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)
{
switch (index)
{
@@
-612,9
+612,9
@@
tree_model_nth_child (GtkTreeModel *model, GtkTreeIter *iter,
GtkTreeIter *parent, gint n)
{
PsppireDict *dict;
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;
if ( parent )
return FALSE;
diff --git
a/src/ui/gui/psppire-var-store.c
b/src/ui/gui/psppire-var-store.c
index 3baf9c6a896c768d1be0e7bc99e1fd70aab91316..b84b0c6e2c9e8586164d8d0099b62d6ac7abdca7 100644
(file)
--- a/
src/ui/gui/psppire-var-store.c
+++ b/
src/ui/gui/psppire-var-store.c
@@
-194,7
+194,7
@@
psppire_var_store_get_var (PsppireVarStore *store, gint row)
static gboolean
psppire_var_store_is_editable (const GSheetModel *model, gint row, gint column)
{
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);
}
return psppire_var_store_item_editable (store, row, column);
}
@@
-202,7
+202,7
@@
psppire_var_store_is_editable (const GSheetModel *model, gint row, gint column)
static const GdkColor *
psppire_var_store_get_foreground (const GSheetModel *model, gint row, gint column)
{
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;
if ( ! psppire_var_store_item_editable (store, row, column) )
return &store->disabled;
@@
-215,7
+215,7
@@
const PangoFontDescription *
psppire_var_store_get_font_desc (const GSheetModel *model,
gint row, gint column)
{
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;
}
return store->font_desc;
}
@@
-262,7
+262,7
@@
psppire_var_store_new (PsppireDict *dict)
static void
var_change_callback (GtkWidget *w, gint n, gpointer data)
{
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);
}
g_sheet_model_range_changed (model,
n, 0, n, n_COLS);
}
@@
-271,7
+271,7
@@
var_change_callback (GtkWidget *w, gint n, gpointer data)
static void
var_delete_callback (GtkWidget *w, gint first, gint n, gpointer data)
{
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);
}
g_sheet_model_rows_deleted (model, first, n);
}
@@
-281,7
+281,7
@@
var_delete_callback (GtkWidget *w, gint first, gint n, gpointer data)
static void
var_insert_callback (GtkWidget *w, gint row, gpointer data)
{
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);
}
g_sheet_model_rows_inserted (model, row, 1);
}
@@
-303,18
+303,18
@@
psppire_var_store_set_dictionary (PsppireVarStore *var_store, PsppireDict *dict)
var_store->dict = dict;
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);
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);
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 */
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
}
static void
@@
-327,7
+327,7
@@
psppire_var_store_finalize (GObject *object)
static gchar *
psppire_var_store_get_string (const GSheetModel *model, gint row, gint column)
{
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;
struct variable *pv;
@@
-349,7
+349,7
@@
psppire_var_store_clear (GSheetModel *model, gint row, gint col)
{
struct variable *pv ;
{
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;
if ( row >= psppire_dict_get_var_cnt (var_store->dict))
return FALSE;
@@
-380,7
+380,7
@@
psppire_var_store_set_string (GSheetModel *model,
{
struct variable *pv ;
{
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;
if ( row >= psppire_dict_get_var_cnt (var_store->dict))
return FALSE;
@@
-707,7
+707,7
@@
psppire_var_store_set_font (PsppireVarStore *store, const PangoFontDescription *
store->font_desc = fd;
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
@@
static gint
psppire_var_store_get_row_count (const GSheetModel * model)
{
gint rows = 0;
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);
if (vs->dict)
rows = psppire_dict_get_var_cnt (vs->dict);
@@
-729,7
+729,7
@@
static gint
geometry_get_row_count (const GSheetRow *geom, gpointer data)
{
gint rows = 0;
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);
if (vs->dict)
rows = psppire_dict_get_var_cnt (vs->dict);
@@
-748,7
+748,7
@@
geometry_get_height (const GSheetRow *geom, gint row, gpointer data)
static gboolean
geometry_is_sensitive (const GSheetRow *geom, gint row, gpointer data)
{
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;
if ( ! vs->dict)
return FALSE;
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index 218f9249b4596dd8d24a9271b14ff734e049eadb..cd2783c32d7afc837540f5700619b539dcf84145 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-155,12
+155,12
@@
main (int argc, char *argv[])
/* connect the signals in the interface */
glade_xml_signal_autoconnect (data_editor_xml);
/* 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 ();
var_data_selection_init ();
@@
-169,7
+169,7
@@
main (int argc, char *argv[])
GList *i;
for ( i = g_list_first (helps); i ; i = g_list_next (i))
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
}
#endif
diff --git
a/src/ui/gui/sort-cases-dialog.c
b/src/ui/gui/sort-cases-dialog.c
index f233dc48e36f733f369811686c426f107c857836..057e94338ecb7691e5f4f29bbd94a19749adc33f 100644
(file)
--- a/
src/ui/gui/sort-cases-dialog.c
+++ b/
src/ui/gui/sort-cases-dialog.c
@@
-198,7
+198,7
@@
deselect_criteria (gpointer data,
path = gtk_tree_row_reference_get_path (row_ref);
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);
gtk_list_store_remove (dialog->criteria_list, &iter);
@@
-298,33
+298,33
@@
sort_cases_dialog_create (GladeXML *xml)
dialog->window = get_widget_assert (xml, "sort-cases-dialog");
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"));
(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"));
(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 =
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_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"),
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"),
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"),
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"),
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
@@
sort_cases_dialog_create (GladeXML *xml)
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
g_signal_connect (selection, "changed",
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
@@
sort_cases_dialog_create (GladeXML *xml)
gtk_tree_view_column_set_sizing (dialog->crit_col, GTK_TREE_VIEW_COLUMN_FIXED);
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",
dialog->crit_col);
g_signal_connect (selection, "changed",
- G_CALLBACK(criteria_selection_changed), dialog);
+ G_CALLBACK
(criteria_selection_changed), dialog);
}
{
}
{
@@
-387,7
+387,7
@@
sort_cases_dialog_create (GladeXML *xml)
);
gtk_tree_view_set_model (dialog->criteria_view,
);
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;
}
dialog->response = GTK_RESPONSE_NONE;
@@
-414,8
+414,8
@@
sort_cases_dialog_run (struct sort_cases_dialog *dialog,
{
g_assert (! g_main_loop_is_running (dialog->loop));
{
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,
gtk_tree_view_column_set_cell_data_func (dialog->crit_col,
@@
-450,7
+450,7
@@
convert_list_store_to_criteria (GtkListStore *list,
gboolean valid;
gint n = 0;
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);
criteria->crit_cnt = gtk_tree_model_iter_n_children (model, NULL);
diff --git
a/src/ui/gui/syntax-editor.c
b/src/ui/gui/syntax-editor.c
index 31307978a970df67e08330532581affc5d30ae4d..d8bf15b9cd8477ba73211c87e857a36326aa1602 100644
(file)
--- a/
src/ui/gui/syntax-editor.c
+++ b/
src/ui/gui/syntax-editor.c
@@
-57,7
+57,7
@@
save_if_modified (struct syntax_editor *se)
{
gint response;
GtkWidget *dialog =
{
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,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
@@
-65,18
+65,18
@@
save_if_modified (struct syntax_editor *se)
e->name ? e->name : _("Untitled")
);
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_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_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);
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
- response = gtk_dialog_run (GTK_DIALOG(dialog));
+ response = gtk_dialog_run (GTK_DIALOG
(dialog));
gtk_widget_destroy (dialog);
gtk_widget_destroy (dialog);
@@
-111,7
+111,7
@@
on_syntax_save_as (GtkMenuItem *menuitem,
GtkWidget *dialog =
gtk_file_chooser_dialog_new (_("Save Syntax"),
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,
GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
@@
-121,14
+121,14
@@
on_syntax_save_as (GtkMenuItem *menuitem,
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_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);
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));
TRUE);
response = gtk_dialog_run (GTK_DIALOG (dialog));
@@
-316,7
+316,7
@@
new_syntax_editor (void)
e->window = get_widget_assert (xml, "syntax_editor");
text_view = get_widget_assert (xml, "syntax_text_view");
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"),
se->lexer = lex_create (the_source_stream);
g_signal_connect (get_widget_assert (xml,"file_new_syntax"),
@@
-494,7
+494,7
@@
open_syntax_window (GtkMenuItem *menuitem, gpointer parent)
GtkWidget *dialog =
gtk_file_chooser_dialog_new (_("Open Syntax"),
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,
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
@@
-504,7
+504,7
@@
open_syntax_window (GtkMenuItem *menuitem, gpointer parent)
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_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"));
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("All Files"));
diff --git
a/src/ui/gui/var-sheet.c
b/src/ui/gui/var-sheet.c
index 7f14602b4159cf415ffa6feec1132cd0e0fae5e3..bb7a0a6026885f09fdb30783494010b54b954f40 100644
(file)
--- a/
src/ui/gui/var-sheet.c
+++ b/
src/ui/gui/var-sheet.c
@@
-152,13
+152,13
@@
traverse_cell_callback (GtkSheet * sheet,
gint *new_row, gint *new_column
)
{
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)
{
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);
const gchar *name = gtk_entry_get_text (entry);
@@
-236,19
+236,19
@@
var_sheet_cell_entry_enter (GtkSheet * sheet, gint row, gint column,
GtkComboBoxEntry *cbe;
gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
cbe =
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);
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);
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:
}
break;
case COL_MEASURE:
@@
-257,17
+257,17
@@
var_sheet_cell_entry_enter (GtkSheet * sheet, gint row, gint column,
GtkComboBoxEntry *cbe;
gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
cbe =
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);
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);
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;
G_CALLBACK (change_measure), pv);
}
break;
@@
-281,7
+281,7
@@
var_sheet_cell_entry_enter (GtkSheet * sheet, gint row, gint column,
gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
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 )
if (!val_labs_dialog )
@@
-289,9
+289,9
@@
var_sheet_cell_entry_enter (GtkSheet * sheet, gint row, gint column,
val_labs_dialog->pv = pv;
val_labs_dialog->pv = pv;
- g_signal_connect_swapped (GTK_OBJECT(customEntry),
+ g_signal_connect_swapped (GTK_OBJECT
(customEntry),
"clicked",
"clicked",
- GTK_SIGNAL_FUNC(val_labs_dialog_show),
+ GTK_SIGNAL_FUNC
(val_labs_dialog_show),
val_labs_dialog);
}
break;
val_labs_dialog);
}
break;
@@
-303,16
+303,16
@@
var_sheet_cell_entry_enter (GtkSheet * sheet, gint row, gint column,
gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
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);
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",
"clicked",
- GTK_SIGNAL_FUNC(missing_val_dialog_show),
+ GTK_SIGNAL_FUNC
(missing_val_dialog_show),
missing_val_dialog);
}
break;
missing_val_dialog);
}
break;
@@
-326,7
+326,7
@@
var_sheet_cell_entry_enter (GtkSheet * sheet, gint row, gint column,
gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
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 */
/* Popup the Variable Type dialog box */
@@
-336,9
+336,9
@@
var_sheet_cell_entry_enter (GtkSheet * sheet, gint row, gint column,
var_type_dialog->pv = pv;
var_type_dialog->pv = pv;
- g_signal_connect_swapped (GTK_OBJECT(customEntry),
+ g_signal_connect_swapped (GTK_OBJECT
(customEntry),
"clicked",
"clicked",
- GTK_SIGNAL_FUNC(var_type_dialog_show),
+ GTK_SIGNAL_FUNC
(var_type_dialog_show),
var_type_dialog);
}
break;
var_type_dialog);
}
break;
@@
-385,9
+385,9
@@
var_sheet_cell_entry_enter (GtkSheet * sheet, gint row, gint column,
gtk_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
spinButton =
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);
}
}
gtk_spin_button_set_digits (spinButton, 0);
}
}
@@
-424,8
+424,8
@@
psppire_variable_sheet_create (gchar *widget_name,
g_assert (the_var_store);
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);
"variable sheet", 0);
@@
-441,7
+441,7
@@
psppire_variable_sheet_create (gchar *widget_name,
GTK_SIGNAL_FUNC (traverse_cell_callback), 0);
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
/* Since this happens inside glade_xml_new, we must prevent strings from
@@
-450,10
+450,10
@@
psppire_variable_sheet_create (gchar *widget_name,
bind_textdomain_codeset (PACKAGE, nl_langinfo (CODESET));
for (i = 0 ; i < n_COLS ; ++i )
{
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));
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);
column_def[i].width);
}
bind_textdomain_codeset (PACKAGE, codeset);
diff --git
a/src/ui/gui/var-type-dialog.c
b/src/ui/gui/var-type-dialog.c
index 2bee901bb5c7f217cdeda64690526c1e0df00ce5..d3eb97edf0515195a63418c9730eb1c53353f7ce 100644
(file)
--- a/
src/ui/gui/var-type-dialog.c
+++ b/
src/ui/gui/var-type-dialog.c
@@
-226,11
+226,11
@@
update_width_decimals (const struct var_type_dialog *dialog)
g_assert (dialog);
text = g_strdup_printf ("%d", dialog->fmt_l.w);
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);
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);
}
g_free (text);
}
@@
-246,17
+246,17
@@
preview_custom (GtkWidget *w, gpointer data)
if ( dialog->active_button != BUTTON_CUSTOM )
return;
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);
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))
{
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
{
}
else
{
@@
-265,12
+265,12
@@
preview_custom (GtkWidget *w, gpointer data)
v.f = 1234.56;
sample_text = value_to_text (v, dialog->fmt_l);
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);
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 ();
g_free (sample_text);
}
msg_enable ();
@@
-334,8
+334,8
@@
var_type_dialog_create (GladeXML *xml)
dialog->window = get_widget_assert (xml,"var_type_dialog");
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");
dialog->radioButton[BUTTON_NUMERIC] =
get_widget_assert (xml,"radiobutton1");
@@
-371,10
+371,10
@@
var_type_dialog_create (GladeXML *xml)
dialog->dollar_window = get_widget_assert (xml, "dollar_window");
dialog->dollar_treeview =
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 =
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");
dialog->ok = get_widget_assert (xml,"var_type_ok");
@@
-394,7
+394,7
@@
var_type_dialog_create (GladeXML *xml)
upleasant resizing effects */
GtkSizeGroup *sizeGroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
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);
add_to_group, sizeGroup);
@@
-403,14
+403,14
@@
var_type_dialog_create (GladeXML *xml)
tgs[i].dialog = dialog;
tgs[i].button = i;
g_signal_connect (dialog->radioButton[i], "toggled",
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_signal_connect (dialog->radioButton[i], "toggled",
- G_CALLBACK(on_toggle_2), dialog);
+ G_CALLBACK
(on_toggle_2), dialog);
}
/* Populate the date format tree view */
}
/* 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 ();
"date_format_list_view"));
renderer = gtk_cell_renderer_text_new ();
@@
-436,13
+436,13
@@
var_type_dialog_create (GladeXML *xml)
-1);
}
-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_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 */
/* populate the dollar treeview */
@@
-473,18
+473,18
@@
var_type_dialog_create (GladeXML *xml)
free (template);
}
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_object_unref (list_store);
- g_signal_connect (GTK_OBJECT(dialog->dollar_treeview),
+ g_signal_connect (GTK_OBJECT
(dialog->dollar_treeview),
"cursor-changed",
"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",
"cursor-changed",
- GTK_SIGNAL_FUNC(update_width_decimals), dialog);
+ GTK_SIGNAL_FUNC
(update_width_decimals), dialog);
/* populate the custom treeview */
/* populate the custom treeview */
@@
-516,34
+516,34
@@
var_type_dialog_create (GladeXML *xml)
-1);
}
-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_object_unref (list_store);
- g_signal_connect (GTK_OBJECT(dialog->custom_treeview),
+ g_signal_connect (GTK_OBJECT
(dialog->custom_treeview),
"cursor-changed",
"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",
"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",
"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",
"changed",
- GTK_SIGNAL_FUNC(preview_custom), dialog);
+ GTK_SIGNAL_FUNC
(preview_custom), dialog);
/* Connect the OK button */
/* 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);
dialog);
@@
-557,7
+557,7
@@
var_type_dialog_create (GladeXML *xml)
void
var_type_dialog_set_active_button (struct var_type_dialog *dialog, gint b)
{
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;
}
TRUE);
dialog->active_button = b;
}
@@
-667,12
+667,12
@@
var_type_dialog_set_state (struct var_type_dialog *dialog)
g_string_printf (str, "%d", write_spec->d);
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);
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);
str->str);
g_string_free (str, TRUE);
@@
-776,10
+776,10
@@
on_var_type_ok_clicked (GtkWidget *w, gpointer data)
{
gint width = atoi (gtk_entry_get_text
{
gint width = atoi (gtk_entry_get_text
- (GTK_ENTRY(dialog->entry_width)));
+ (GTK_ENTRY
(dialog->entry_width)));
gint decimals = atoi (gtk_entry_get_text
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;
gint new_type = VAR_NUMERIC;
gint new_width = 0;
diff --git
a/src/ui/gui/window-manager.c
b/src/ui/gui/window-manager.c
index 5fcf39dfac6d04374bdc5268d85289c18f138418..8ecce98c7c1a2e3581341aac7be78fd216fe1e62 100644
(file)
--- a/
src/ui/gui/window-manager.c
+++ b/
src/ui/gui/window-manager.c
@@
-45,7
+45,7
@@
window_create (enum window_type type, const gchar *name)
set_window_name (e, name);
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);
PKGDATADIR "/psppicon.png", 0);
g_signal_connect (e->window, "destroy", G_CALLBACK (deregister), NULL);
@@
-86,7
+86,7
@@
set_window_name (struct editor_window *e,
g_assert_not_reached ();
}
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);
}
g_free (title);
}
@@
-114,7
+114,7
@@
window_set_name_from_filename (struct editor_window *e,
}
g_free (basename);
}
g_free (basename);
- gtk_window_set_title (GTK_WINDOW(e->window), title);
+ gtk_window_set_title (GTK_WINDOW
(e->window), title);
g_free (title);
}
g_free (title);
}
@@
-123,7
+123,7
@@
window_set_name_from_filename (struct editor_window *e,
GtkWindow *
window_toplevel (const struct editor_window *e)
{
GtkWindow *
window_toplevel (const struct editor_window *e)
{
- return GTK_WINDOW(e->window);
+ return GTK_WINDOW
(e->window);
}
const gchar *
}
const gchar *