From 0bda70f475aad77db5636ae0bca170513353c988 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 27 Dec 2015 10:10:49 +0100 Subject: [PATCH] Change some instances of GtkAction to PsppireDialogAction --- src/ui/gui/psppire-dialog-action-1sks.c | 2 +- src/ui/gui/psppire-dialog-action-aggregate.c | 2 +- src/ui/gui/psppire-dialog-action-autorecode.c | 2 +- src/ui/gui/psppire-dialog-action-barchart.c | 2 +- src/ui/gui/psppire-dialog-action-binomial.c | 2 +- src/ui/gui/psppire-dialog-action-chisquare.c | 2 +- src/ui/gui/psppire-dialog-action-compute.c | 2 +- src/ui/gui/psppire-dialog-action-correlation.c | 2 +- src/ui/gui/psppire-dialog-action-count.c | 2 +- src/ui/gui/psppire-dialog-action-crosstabs.c | 2 +- src/ui/gui/psppire-dialog-action-descriptives.c | 2 +- src/ui/gui/psppire-dialog-action-examine.c | 2 +- src/ui/gui/psppire-dialog-action-factor.c | 2 +- src/ui/gui/psppire-dialog-action-flip.c | 2 +- src/ui/gui/psppire-dialog-action-frequencies.c | 2 +- src/ui/gui/psppire-dialog-action-histogram.c | 2 +- src/ui/gui/psppire-dialog-action-indep-samps.c | 2 +- src/ui/gui/psppire-dialog-action-k-related.c | 2 +- src/ui/gui/psppire-dialog-action-kmeans.c | 2 +- src/ui/gui/psppire-dialog-action-logistic.c | 2 +- src/ui/gui/psppire-dialog-action-means.c | 2 +- src/ui/gui/psppire-dialog-action-oneway.c | 2 +- src/ui/gui/psppire-dialog-action-paired.c | 2 +- src/ui/gui/psppire-dialog-action-rank.c | 2 +- src/ui/gui/psppire-dialog-action-regression.c | 2 +- src/ui/gui/psppire-dialog-action-reliability.c | 2 +- src/ui/gui/psppire-dialog-action-roc.c | 4 ++-- src/ui/gui/psppire-dialog-action-runs.c | 2 +- src/ui/gui/psppire-dialog-action-scatterplot.c | 2 +- src/ui/gui/psppire-dialog-action-sort.c | 2 +- src/ui/gui/psppire-dialog-action-tt1s.c | 2 +- src/ui/gui/psppire-dialog-action-two-sample.c | 2 +- src/ui/gui/psppire-dialog-action-univariate.c | 2 +- src/ui/gui/psppire-dialog-action-var-info.c | 2 +- src/ui/gui/psppire-dialog-action.h | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/ui/gui/psppire-dialog-action-1sks.c b/src/ui/gui/psppire-dialog-action-1sks.c index fda5b4b47..c79ebc577 100644 --- a/src/ui/gui/psppire-dialog-action-1sks.c +++ b/src/ui/gui/psppire-dialog-action-1sks.c @@ -117,7 +117,7 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_1sks_activate (GtkAction *a) +psppire_dialog_action_1sks_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogAction1sks *act = PSPPIRE_DIALOG_ACTION_1SKS (a); diff --git a/src/ui/gui/psppire-dialog-action-aggregate.c b/src/ui/gui/psppire-dialog-action-aggregate.c index e62d02bf0..cb0c4727c 100644 --- a/src/ui/gui/psppire-dialog-action-aggregate.c +++ b/src/ui/gui/psppire-dialog-action-aggregate.c @@ -483,7 +483,7 @@ update_arguments (PsppireDialogActionAggregate *agg) static void -psppire_dialog_action_aggregate_activate (GtkAction *a) +psppire_dialog_action_aggregate_activate (PsppireDialogAction *a) { PsppireDialogActionAggregate *act = PSPPIRE_DIALOG_ACTION_AGGREGATE (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-autorecode.c b/src/ui/gui/psppire-dialog-action-autorecode.c index 24cbe5421..a86420919 100644 --- a/src/ui/gui/psppire-dialog-action-autorecode.c +++ b/src/ui/gui/psppire-dialog-action-autorecode.c @@ -309,7 +309,7 @@ render_new_var_name (GtkTreeViewColumn *tree_column, static void -psppire_dialog_action_autorecode_activate (GtkAction *a) +psppire_dialog_action_autorecode_activate (PsppireDialogAction *a) { PsppireDialogActionAutorecode *act = PSPPIRE_DIALOG_ACTION_AUTORECODE (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-barchart.c b/src/ui/gui/psppire-dialog-action-barchart.c index 34ac62b5a..52eced9ee 100644 --- a/src/ui/gui/psppire-dialog-action-barchart.c +++ b/src/ui/gui/psppire-dialog-action-barchart.c @@ -115,7 +115,7 @@ populate_combo_model (GtkComboBox *cb) static void -psppire_dialog_action_barchart_activate (GtkAction *a) +psppire_dialog_action_barchart_activate (PsppireDialogAction *a) { PsppireDialogActionBarchart *act = PSPPIRE_DIALOG_ACTION_BARCHART (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-binomial.c b/src/ui/gui/psppire-dialog-action-binomial.c index 2efcc6c4b..e76bd12e5 100644 --- a/src/ui/gui/psppire-dialog-action-binomial.c +++ b/src/ui/gui/psppire-dialog-action-binomial.c @@ -97,7 +97,7 @@ refresh (PsppireDialogAction *da) static void -psppire_dialog_action_binomial_activate (GtkAction *a) +psppire_dialog_action_binomial_activate (PsppireDialogAction *a) { PsppireDialogActionBinomial *act = PSPPIRE_DIALOG_ACTION_BINOMIAL (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-chisquare.c b/src/ui/gui/psppire-dialog-action-chisquare.c index 00b6d22a4..4961a02cc 100644 --- a/src/ui/gui/psppire-dialog-action-chisquare.c +++ b/src/ui/gui/psppire-dialog-action-chisquare.c @@ -129,7 +129,7 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_chisquare_activate (GtkAction *a) +psppire_dialog_action_chisquare_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionChisquare *act = PSPPIRE_DIALOG_ACTION_CHISQUARE (a); diff --git a/src/ui/gui/psppire-dialog-action-compute.c b/src/ui/gui/psppire-dialog-action-compute.c index e40dcd895..a97d19535 100644 --- a/src/ui/gui/psppire-dialog-action-compute.c +++ b/src/ui/gui/psppire-dialog-action-compute.c @@ -456,7 +456,7 @@ insert_function_into_syntax_area (GtkTreeIter iter, static void -psppire_dialog_action_compute_activate (GtkAction *a) +psppire_dialog_action_compute_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionCompute *act = PSPPIRE_DIALOG_ACTION_COMPUTE (a); diff --git a/src/ui/gui/psppire-dialog-action-correlation.c b/src/ui/gui/psppire-dialog-action-correlation.c index e3f7017ff..81b694a7a 100644 --- a/src/ui/gui/psppire-dialog-action-correlation.c +++ b/src/ui/gui/psppire-dialog-action-correlation.c @@ -92,7 +92,7 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_correlation_activate (GtkAction *a) +psppire_dialog_action_correlation_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionCorrelation *act = PSPPIRE_DIALOG_ACTION_CORRELATION (a); diff --git a/src/ui/gui/psppire-dialog-action-count.c b/src/ui/gui/psppire-dialog-action-count.c index 84e4bda76..f6937b9b6 100644 --- a/src/ui/gui/psppire-dialog-action-count.c +++ b/src/ui/gui/psppire-dialog-action-count.c @@ -145,7 +145,7 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_count_activate (GtkAction *a) +psppire_dialog_action_count_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionCount *act = PSPPIRE_DIALOG_ACTION_COUNT (a); diff --git a/src/ui/gui/psppire-dialog-action-crosstabs.c b/src/ui/gui/psppire-dialog-action-crosstabs.c index e451ea413..afb450a3a 100644 --- a/src/ui/gui/psppire-dialog-action-crosstabs.c +++ b/src/ui/gui/psppire-dialog-action-crosstabs.c @@ -203,7 +203,7 @@ on_statistics_clicked (PsppireDialogActionCrosstabs *cd) static void -psppire_dialog_action_crosstabs_activate (GtkAction *a) +psppire_dialog_action_crosstabs_activate (PsppireDialogAction *a) { PsppireDialogActionCrosstabs *act = PSPPIRE_DIALOG_ACTION_CROSSTABS (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-descriptives.c b/src/ui/gui/psppire-dialog-action-descriptives.c index ac437f425..55535043a 100644 --- a/src/ui/gui/psppire-dialog-action-descriptives.c +++ b/src/ui/gui/psppire-dialog-action-descriptives.c @@ -194,7 +194,7 @@ dialog_refresh (PsppireDialogAction *scd_) static void -psppire_dialog_action_descriptives_activate (GtkAction *a) +psppire_dialog_action_descriptives_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionDescriptives *act = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (a); diff --git a/src/ui/gui/psppire-dialog-action-examine.c b/src/ui/gui/psppire-dialog-action-examine.c index 841280a23..990610c38 100644 --- a/src/ui/gui/psppire-dialog-action-examine.c +++ b/src/ui/gui/psppire-dialog-action-examine.c @@ -198,7 +198,7 @@ dialog_refresh (PsppireDialogAction *da) } static void -psppire_dialog_action_examine_activate (GtkAction *a) +psppire_dialog_action_examine_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionExamine *act = PSPPIRE_DIALOG_ACTION_EXAMINE (a); diff --git a/src/ui/gui/psppire-dialog-action-factor.c b/src/ui/gui/psppire-dialog-action-factor.c index cefa7f5a7..6802bfe2c 100644 --- a/src/ui/gui/psppire-dialog-action-factor.c +++ b/src/ui/gui/psppire-dialog-action-factor.c @@ -294,7 +294,7 @@ run_rotations_subdialog (PsppireDialogActionFactor *act) } static void -psppire_dialog_action_factor_activate (GtkAction *a) +psppire_dialog_action_factor_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionFactor *act = PSPPIRE_DIALOG_ACTION_FACTOR (a); diff --git a/src/ui/gui/psppire-dialog-action-flip.c b/src/ui/gui/psppire-dialog-action-flip.c index 03fc9d9ce..194864595 100644 --- a/src/ui/gui/psppire-dialog-action-flip.c +++ b/src/ui/gui/psppire-dialog-action-flip.c @@ -90,7 +90,7 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_flip_activate (GtkAction *a) +psppire_dialog_action_flip_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionFlip *act = PSPPIRE_DIALOG_ACTION_FLIP (a); diff --git a/src/ui/gui/psppire-dialog-action-frequencies.c b/src/ui/gui/psppire-dialog-action-frequencies.c index 7b69c8efa..e154d8883 100644 --- a/src/ui/gui/psppire-dialog-action-frequencies.c +++ b/src/ui/gui/psppire-dialog-action-frequencies.c @@ -254,7 +254,7 @@ refresh (PsppireDialogAction * fdx) static void -psppire_dialog_action_frequencies_activate (GtkAction * a) +psppire_dialog_action_frequencies_activate (PsppireDialogAction * a) { PsppireDialogActionFrequencies *act = PSPPIRE_DIALOG_ACTION_FREQUENCIES (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-histogram.c b/src/ui/gui/psppire-dialog-action-histogram.c index 3cf1fe77b..c3f741f78 100644 --- a/src/ui/gui/psppire-dialog-action-histogram.c +++ b/src/ui/gui/psppire-dialog-action-histogram.c @@ -59,7 +59,7 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_histogram_activate (GtkAction *a) +psppire_dialog_action_histogram_activate (PsppireDialogAction *a) { PsppireDialogActionHistogram *act = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-indep-samps.c b/src/ui/gui/psppire-dialog-action-indep-samps.c index dac62af76..402efe8f2 100644 --- a/src/ui/gui/psppire-dialog-action-indep-samps.c +++ b/src/ui/gui/psppire-dialog-action-indep-samps.c @@ -287,7 +287,7 @@ set_group_criterion_type (GtkToggleButton *button, static void -psppire_dialog_action_indep_samps_activate (GtkAction *a) +psppire_dialog_action_indep_samps_activate (PsppireDialogAction *a) { PsppireDialogActionIndepSamps *act = PSPPIRE_DIALOG_ACTION_INDEP_SAMPS (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-k-related.c b/src/ui/gui/psppire-dialog-action-k-related.c index 1c4d0c094..7c634ec6d 100644 --- a/src/ui/gui/psppire-dialog-action-k-related.c +++ b/src/ui/gui/psppire-dialog-action-k-related.c @@ -105,7 +105,7 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_k_related_activate (GtkAction *a) +psppire_dialog_action_k_related_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a); diff --git a/src/ui/gui/psppire-dialog-action-kmeans.c b/src/ui/gui/psppire-dialog-action-kmeans.c index 39be5670b..e73d20439 100644 --- a/src/ui/gui/psppire-dialog-action-kmeans.c +++ b/src/ui/gui/psppire-dialog-action-kmeans.c @@ -82,7 +82,7 @@ refresh (PsppireDialogAction *fd_) } static void -psppire_dialog_action_kmeans_activate (GtkAction *a) +psppire_dialog_action_kmeans_activate (PsppireDialogAction *a) { PsppireDialogActionKmeans *act = PSPPIRE_DIALOG_ACTION_KMEANS (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c index 15f7d6b9e..cdf39f783 100644 --- a/src/ui/gui/psppire-dialog-action-logistic.c +++ b/src/ui/gui/psppire-dialog-action-logistic.c @@ -96,7 +96,7 @@ on_opts_clicked (PsppireDialogActionLogistic *act) static void -psppire_dialog_action_logistic_activate (GtkAction *a) +psppire_dialog_action_logistic_activate (PsppireDialogAction *a) { PsppireDialogActionLogistic *act = PSPPIRE_DIALOG_ACTION_LOGISTIC (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-means.c b/src/ui/gui/psppire-dialog-action-means.c index 5c84c0f21..f7210e42e 100644 --- a/src/ui/gui/psppire-dialog-action-means.c +++ b/src/ui/gui/psppire-dialog-action-means.c @@ -92,7 +92,7 @@ dialog_refresh (PsppireDialogAction *da) } static void -psppire_dialog_action_means_activate (GtkAction *a) +psppire_dialog_action_means_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionMeans *act = PSPPIRE_DIALOG_ACTION_MEANS (a); diff --git a/src/ui/gui/psppire-dialog-action-oneway.c b/src/ui/gui/psppire-dialog-action-oneway.c index 35e2d3996..35bbf01d1 100644 --- a/src/ui/gui/psppire-dialog-action-oneway.c +++ b/src/ui/gui/psppire-dialog-action-oneway.c @@ -221,7 +221,7 @@ clone_contrasts_array (GArray *src_array) static void -psppire_dialog_action_oneway_activate (GtkAction *a) +psppire_dialog_action_oneway_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionOneway *act = PSPPIRE_DIALOG_ACTION_ONEWAY (a); diff --git a/src/ui/gui/psppire-dialog-action-paired.c b/src/ui/gui/psppire-dialog-action-paired.c index b6bd72f67..c08a4d60e 100644 --- a/src/ui/gui/psppire-dialog-action-paired.c +++ b/src/ui/gui/psppire-dialog-action-paired.c @@ -150,7 +150,7 @@ generate_syntax (PsppireDialogAction *pda) } static void -psppire_dialog_action_paired_activate (GtkAction *a) +psppire_dialog_action_paired_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionPaired *act = PSPPIRE_DIALOG_ACTION_PAIRED (a); diff --git a/src/ui/gui/psppire-dialog-action-rank.c b/src/ui/gui/psppire-dialog-action-rank.c index 460044bbe..f898ba5e3 100644 --- a/src/ui/gui/psppire-dialog-action-rank.c +++ b/src/ui/gui/psppire-dialog-action-rank.c @@ -207,7 +207,7 @@ set_sensitivity (PsppireDialogActionRank *dar) } static void -psppire_dialog_action_rank_activate (GtkAction *a) +psppire_dialog_action_rank_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionRank *act = PSPPIRE_DIALOG_ACTION_RANK (a); diff --git a/src/ui/gui/psppire-dialog-action-regression.c b/src/ui/gui/psppire-dialog-action-regression.c index 402c1d62f..68b504b88 100644 --- a/src/ui/gui/psppire-dialog-action-regression.c +++ b/src/ui/gui/psppire-dialog-action-regression.c @@ -142,7 +142,7 @@ on_save_clicked (PsppireDialogActionRegression *rd) static void -psppire_dialog_action_regression_activate (GtkAction *a) +psppire_dialog_action_regression_activate (PsppireDialogAction *a) { PsppireDialogActionRegression *act = PSPPIRE_DIALOG_ACTION_REGRESSION (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-reliability.c b/src/ui/gui/psppire-dialog-action-reliability.c index 3f5d0769c..b7df2049d 100644 --- a/src/ui/gui/psppire-dialog-action-reliability.c +++ b/src/ui/gui/psppire-dialog-action-reliability.c @@ -120,7 +120,7 @@ refresh (PsppireDialogAction *pda_) } static void -psppire_dialog_action_reliability_activate (GtkAction *a) +psppire_dialog_action_reliability_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionReliability *act = PSPPIRE_DIALOG_ACTION_RELIABILITY (a); diff --git a/src/ui/gui/psppire-dialog-action-roc.c b/src/ui/gui/psppire-dialog-action-roc.c index a2d53a153..fbf5bfd91 100644 --- a/src/ui/gui/psppire-dialog-action-roc.c +++ b/src/ui/gui/psppire-dialog-action-roc.c @@ -105,7 +105,7 @@ refresh (PsppireDialogAction *rd_) } static void -on_state_var_changed (GtkAction *a) +on_state_var_changed (PsppireDialogAction *a) { PsppireDialogActionRoc *act = PSPPIRE_DIALOG_ACTION_ROC (a); @@ -121,7 +121,7 @@ on_state_var_changed (GtkAction *a) } static void -psppire_dialog_action_roc_activate (GtkAction *a) +psppire_dialog_action_roc_activate (PsppireDialogAction *a) { PsppireDialogActionRoc *act = PSPPIRE_DIALOG_ACTION_ROC (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); diff --git a/src/ui/gui/psppire-dialog-action-runs.c b/src/ui/gui/psppire-dialog-action-runs.c index 1ef281db4..6d5af383b 100644 --- a/src/ui/gui/psppire-dialog-action-runs.c +++ b/src/ui/gui/psppire-dialog-action-runs.c @@ -128,7 +128,7 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_runs_activate (GtkAction *a) +psppire_dialog_action_runs_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionRuns *act = PSPPIRE_DIALOG_ACTION_RUNS (a); diff --git a/src/ui/gui/psppire-dialog-action-scatterplot.c b/src/ui/gui/psppire-dialog-action-scatterplot.c index e59353c97..34bd13fbf 100644 --- a/src/ui/gui/psppire-dialog-action-scatterplot.c +++ b/src/ui/gui/psppire-dialog-action-scatterplot.c @@ -91,7 +91,7 @@ refresh (PsppireDialogAction *rd_) static void -psppire_dialog_action_scatterplot_activate (GtkAction *a) +psppire_dialog_action_scatterplot_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionScatterplot *act = PSPPIRE_DIALOG_ACTION_SCATTERPLOT (a); diff --git a/src/ui/gui/psppire-dialog-action-sort.c b/src/ui/gui/psppire-dialog-action-sort.c index c911d437f..8377e9592 100644 --- a/src/ui/gui/psppire-dialog-action-sort.c +++ b/src/ui/gui/psppire-dialog-action-sort.c @@ -90,7 +90,7 @@ dialog_state_valid (gpointer act) static void -psppire_dialog_action_sort_activate (GtkAction *a) +psppire_dialog_action_sort_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionSort *act = PSPPIRE_DIALOG_ACTION_SORT (a); diff --git a/src/ui/gui/psppire-dialog-action-tt1s.c b/src/ui/gui/psppire-dialog-action-tt1s.c index f6f1cf618..8f3932958 100644 --- a/src/ui/gui/psppire-dialog-action-tt1s.c +++ b/src/ui/gui/psppire-dialog-action-tt1s.c @@ -103,7 +103,7 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_tt1s_activate (GtkAction *a) +psppire_dialog_action_tt1s_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionTt1s *act = PSPPIRE_DIALOG_ACTION_TT1S (a); diff --git a/src/ui/gui/psppire-dialog-action-two-sample.c b/src/ui/gui/psppire-dialog-action-two-sample.c index b10ee4c13..73df59234 100644 --- a/src/ui/gui/psppire-dialog-action-two-sample.c +++ b/src/ui/gui/psppire-dialog-action-two-sample.c @@ -169,7 +169,7 @@ generate_syntax (PsppireDialogAction *pda) } static void -psppire_dialog_action_two_sample_activate (GtkAction *a) +psppire_dialog_action_two_sample_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionTwoSample *act = PSPPIRE_DIALOG_ACTION_TWO_SAMPLE (a); diff --git a/src/ui/gui/psppire-dialog-action-univariate.c b/src/ui/gui/psppire-dialog-action-univariate.c index c388075be..ebc8d2f73 100644 --- a/src/ui/gui/psppire-dialog-action-univariate.c +++ b/src/ui/gui/psppire-dialog-action-univariate.c @@ -83,7 +83,7 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_univariate_activate (GtkAction *a) +psppire_dialog_action_univariate_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionUnivariate *act = PSPPIRE_DIALOG_ACTION_UNIVARIATE (a); diff --git a/src/ui/gui/psppire-dialog-action-var-info.c b/src/ui/gui/psppire-dialog-action-var-info.c index 31580dd9f..58ffb4d55 100644 --- a/src/ui/gui/psppire-dialog-action-var-info.c +++ b/src/ui/gui/psppire-dialog-action-var-info.c @@ -164,7 +164,7 @@ jump_to (PsppireDialog *d, gint response, gpointer data) } static void -psppire_dialog_action_var_info_activate (GtkAction *a) +psppire_dialog_action_var_info_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionVarInfo *act = PSPPIRE_DIALOG_ACTION_VAR_INFO (pda); diff --git a/src/ui/gui/psppire-dialog-action.h b/src/ui/gui/psppire-dialog-action.h index 399637984..c753ecf31 100644 --- a/src/ui/gui/psppire-dialog-action.h +++ b/src/ui/gui/psppire-dialog-action.h @@ -96,7 +96,7 @@ void psppire_dialog_action_set_refresh (PsppireDialogAction *pda, void psppire_dialog_action_set_valid_predicate (PsppireDialogAction *act, ContentsAreValid dialog_state_valid); -typedef void (*activation) (GtkAction *); +typedef void (*activation) (PsppireDialogAction *); void psppire_dialog_action_set_activation (gpointer class, activation a); -- 2.11.4.GIT