Select Cases Dialog: Convert to PsppireDialogAction

[pspp] / src / ui / gui / widgets.c

diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c
index 71c472d5487c153719740c1ea8a76ed4a8c2bf2f..78e67382da09768b9c17e5a22d2202a255dae683 100644 (file)
--- a/src/ui/gui/widgets.c
+++ b/src/ui/gui/widgets.c
@@ -16,10 +16,13 @@
 #include "psppire-val-chooser.h"
 #include "psppire-checkbox-treeview.h"
 
+#include "psppire-dialog-action-aggregate.h"
+#include "psppire-dialog-action-autorecode.h"
 #include "psppire-dialog-action-barchart.h"
 #include "psppire-dialog-action-binomial.h"
 #include "psppire-dialog-action-chisquare.h"
 #include "psppire-dialog-action-compute.h"
+#include "psppire-dialog-action-comments.h"
 #include "psppire-dialog-action-correlation.h"
 #include "psppire-dialog-action-count.h"
 #include "psppire-dialog-action-crosstabs.h"
@@ -44,15 +47,77 @@
 #include "psppire-dialog-action-roc.h"
 #include "psppire-dialog-action-runs.h"
 #include "psppire-dialog-action-scatterplot.h"
+#include "psppire-dialog-action-select.h"
 #include "psppire-dialog-action-sort.h"
+#include "psppire-dialog-action-split.h"
 #include "psppire-dialog-action-tt1s.h"
 #include "psppire-dialog-action-two-sample.h"
 #include "psppire-dialog-action-univariate.h"
 #include "psppire-dialog-action-var-info.h"
+#include "psppire-dialog-action-weight.h"
 #include "psppire-value-entry.h"
 
 static  volatile GType kludge;
 
+
+typedef GType (*get_type_func)(void);
+
+static const get_type_func dialog_action_types[]=
+{
+  psppire_dialog_action_1sks_get_type,
+  psppire_dialog_action_autorecode_get_type,
+  psppire_dialog_action_aggregate_get_type,
+  psppire_dialog_action_binomial_get_type,
+  psppire_dialog_action_barchart_get_type,
+  psppire_dialog_action_chisquare_get_type,
+  psppire_dialog_action_compute_get_type,
+  psppire_dialog_action_comments_get_type,
+  psppire_dialog_action_correlation_get_type,
+  psppire_dialog_action_count_get_type,
+  psppire_dialog_action_crosstabs_get_type,
+  psppire_dialog_action_descriptives_get_type,
+  psppire_dialog_action_examine_get_type,
+  psppire_dialog_action_factor_get_type,
+  psppire_dialog_action_flip_get_type,
+  psppire_dialog_action_frequencies_get_type,
+  psppire_dialog_action_histogram_get_type,
+  psppire_dialog_action_logistic_get_type,
+  psppire_dialog_action_kmeans_get_type,
+  psppire_dialog_action_k_related_get_type,
+  psppire_dialog_action_means_get_type,
+  psppire_dialog_action_oneway_get_type,
+  psppire_dialog_action_paired_get_type,
+  psppire_dialog_action_indep_samps_get_type,
+  psppire_dialog_action_var_info_get_type,
+  psppire_dialog_action_rank_get_type,
+  psppire_dialog_action_reliability_get_type,
+  psppire_dialog_action_regression_get_type,
+  psppire_dialog_action_roc_get_type,
+  psppire_dialog_action_runs_get_type,
+  psppire_dialog_action_scatterplot_get_type,
+  psppire_dialog_action_select_get_type,
+  psppire_dialog_action_sort_get_type,
+  psppire_dialog_action_split_get_type,
+  psppire_dialog_action_tt1s_get_type,
+  psppire_dialog_action_two_sample_get_type,
+  psppire_dialog_action_weight_get_type,
+  psppire_dialog_action_univariate_get_type
+};
+
+
+static void
+preregister_actions (void)
+{
+  int i;
+  for (i = 0; i < sizeof (dialog_action_types) / sizeof (dialog_action_types[0]); ++i)
+    {
+      get_type_func x = dialog_action_types[i];
+      x ();
+    }
+}
+
+
+
 /* Any custom widgets which are to be used in GtkBuilder ui files
    need to be preregistered, otherwise GtkBuilder refuses to 
    acknowledge their existence. */
@@ -70,40 +135,9 @@ preregister_widgets (void)
   psppire_var_view_get_type ();
   psppire_value_entry_get_type ();
   psppire_checkbox_treeview_get_type ();
-
-  psppire_dialog_action_1sks_get_type ();
-  psppire_dialog_action_binomial_get_type ();
-  psppire_dialog_action_barchart_get_type ();
-  psppire_dialog_action_chisquare_get_type ();
-  psppire_dialog_action_compute_get_type ();
-  psppire_dialog_action_correlation_get_type ();
-  psppire_dialog_action_count_get_type ();
-  psppire_dialog_action_crosstabs_get_type ();
-  psppire_dialog_action_descriptives_get_type ();
-  psppire_dialog_action_examine_get_type ();
-  psppire_dialog_action_factor_get_type ();
-  psppire_dialog_action_flip_get_type ();
-  psppire_dialog_action_frequencies_get_type ();
-  psppire_dialog_action_histogram_get_type ();
-  psppire_dialog_action_logistic_get_type ();
-  psppire_dialog_action_kmeans_get_type ();
-  psppire_dialog_action_k_related_get_type ();
-  psppire_dialog_action_means_get_type ();
-  psppire_dialog_action_oneway_get_type ();
-  psppire_dialog_action_paired_get_type ();
-  psppire_dialog_action_indep_samps_get_type ();
   psppire_means_layer_get_type ();
-  psppire_dialog_action_var_info_get_type ();
-  psppire_dialog_action_rank_get_type ();
-  psppire_dialog_action_reliability_get_type ();
-  psppire_dialog_action_regression_get_type ();
-  psppire_dialog_action_roc_get_type ();
-  psppire_dialog_action_runs_get_type ();
-  psppire_dialog_action_scatterplot_get_type ();
-  psppire_dialog_action_sort_get_type ();
-  psppire_dialog_action_tt1s_get_type ();
-  psppire_dialog_action_two_sample_get_type ();
-  psppire_dialog_action_univariate_get_type ();
+
+  preregister_actions ();
 
   /* This seems to be necessary on Cygwin.
      It ought not to be necessary.  Having it here can't do any harm. */