Change some instances of GtkAction to PsppireDialogAction

diff --git a/src/ui/gui/psppire-dialog-action-1sks.c b/src/ui/gui/psppire-dialog-action-1sks.c
index fda5b4b479ed3d56bbaea51893a7a9f08143b4ec..c79ebc577930eb248b95124fba6af364a36e8608 100644 (file)
--- 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 e62d02bf0ce176561d45f1f91fccf1687b83c436..cb0c4727ca1854c8a654ca3957f5743cdd8a13bf 100644 (file)
--- 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 24cbe54210706b7742c30731fce54e5cb3581782..a86420919af8266eff7c2f69b33ab55291e10260 100644 (file)
--- 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 34ac62b5a17091afc3189d7885cd13ac18b1114b..52eced9ee5f55d22158787dc80fc063b574b87e1 100644 (file)
--- 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 2efcc6c4b017b8110948ff9d199832d8e11521bd..e76bd12e5bbcfa1d13d1f01458b0b9ba4fac7aee 100644 (file)
--- 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 00b6d22a4f46ac89608cd17002f463f89a2c37a6..4961a02cc062c2b0b7a0b1f3ce6f672b333402c4 100644 (file)
--- 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 e40dcd89581b3563e4e0d9b500c21d0c14b066e9..a97d19535d49d8aa4672377d944b775179d44e0f 100644 (file)
--- 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 e3f7017fffc9ca05045b03a736a5a6d2ec05ac03..81b694a7aa147489fa7b0eec989f810f2d94d80e 100644 (file)
--- 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 84e4bda76bc5d14b2bfa16133a0499eef093b5ec..f6937b9b6d1c9d7e61ee3b1d04bd247e7a746dae 100644 (file)
--- 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 e451ea41367ae9fa55cf2eaf60cb1c9a6941dfc9..afb450a3ad884eaee1e6e4bddf6282d3b1330620 100644 (file)
--- 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 ac437f425ce3d8a42aeaeb96419ad969c6bd0248..55535043a8f995c6ba530387195788da7d5885f8 100644 (file)
--- 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 841280a23d24ba15c2ca09c4cfe1768578d96cf2..990610c383aab872693e14aa4f46931421a27b73 100644 (file)
--- 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 cefa7f5a76124d6d463ffa9e7dc2759e6e1d3723..6802bfe2c182850a233e8a325bc7d08e8065f15d 100644 (file)
--- 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 03fc9d9ce1029652bd3dfda5ed9bd5543e50306d..194864595916d52b7ebf586a72d409c3852bec09 100644 (file)
--- 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 7b69c8efa94588046227a0c920114a47f268fde3..e154d888304c14c2302ad998808555ad66a059b6 100644 (file)
--- 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 3cf1fe77bc9ae4933ea884295c5368ed926ad724..c3f741f782626695dd2e8b0b8689111e07783671 100644 (file)
--- 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 dac62af76c8e0c6db91910471fb6aa65548c9d2e..402efe8f250444d3c22dc5c30b297a37f41f1ede 100644 (file)
--- 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 1c4d0c094dd64c9d9e61fba9e9af6ed3f4f3e724..7c634ec6d35f0d65a340340a0720f90f5efa6ec3 100644 (file)
--- 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 39be5670b72e71d5fcb62fcce6f8e0f3b399d569..e73d20439464c08b0d0e4708a61675e11052f091 100644 (file)
--- 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 15f7d6b9e5bf1eafd728e936ca999bdd940161c7..cdf39f7836f99ba23d8e39d85502fa52e28fb816 100644 (file)
--- 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 5c84c0f2199a11fcd9ffcf0cf6f38c4849a00ce4..f7210e42ee9571a7cf4488885a5cd6b9917dbf3c 100644 (file)
--- 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 35e2d3996634eb06339ada98227764b048207f02..35bbf01d1947a92db4bc772d6e78494747e8068a 100644 (file)
--- 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 b6bd72f67743223ea999edb4c0eb9378ac0d9c09..c08a4d60e6ef2dc6421e903342f263fc7aae0d04 100644 (file)
--- 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 460044bbe1eedd5288c648b4f7608c3af3f501bb..f898ba5e3dee140662df6cee86e169aeccd328ef 100644 (file)
--- 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 402c1d62fdc9287e4b8243fc31aa21559ffc419b..68b504b888e1276f12f65f024a92b731d18df079 100644 (file)
--- 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 3f5d0769ca51dbc3dbe5731aca8888c5c31bcb5d..b7df2049d9ee8eb4199f385ef0fb9a0cb1ed6fd6 100644 (file)
--- 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 a2d53a15318a69f76eaeafb4d62b6279f7046a12..fbf5bfd91ca3fbe634b6cb65cee01d6b16db5951 100644 (file)
--- 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 1ef281db465a18c2d0226fa3a9f49665bea15336..6d5af383b5029b402ee871b0ef8db1b88a252424 100644 (file)
--- 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 e59353c973a2f675f64e48163f02960c4d397af8..34bd13fbf0d2d31fe753d294092d5e9f76671e9c 100644 (file)
--- 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 c911d437f7489b17aa8cec3430a24cc6b1bb7783..8377e9592fd27fd716abac36d496e31a2b8305ad 100644 (file)
--- 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 f6f1cf618e839111a37841b15599968f3495bd1a..8f3932958d917d5c77dc5455ed0957e555b74093 100644 (file)
--- 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 b10ee4c137a8b0cb5f04b875064af325274dcdc2..73df59234e0eebe5ac4577cd73fc9249b87e16af 100644 (file)
--- 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 c388075be0fea64159f664936aa80cb7bdb5aedf..ebc8d2f73e30b067a1fcc7f8f79938934d8508e1 100644 (file)
--- 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 31580dd9f97e347f923447cd0f1d4db26e3340d7..58ffb4d558049450263ef7a7acea9205572da4d3 100644 (file)
--- 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 39963798430d212ee87184f96f938489139280b3..c753ecf31348bead7e2060d6dd842fd9bddca368 100644 (file)
--- 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);