Merge remote branch 'origin/master' into import-gui

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

diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c
index 008d37e52a30440ccf5200e41e28fd8005ef7750..488656e9e6365173805a373c0fa64e03e6fe8ad6 100644 (file)
--- a/src/ui/gui/widgets.c
+++ b/src/ui/gui/widgets.c
@@ -1,5 +1,7 @@
 #include <config.h>
 
+#include <gtksourceview/gtksourceview.h>
+
 #include "widgets.h"
 
 
@@ -13,12 +15,16 @@
 #include "psppire-var-view.h"
 #include "psppire-val-chooser.h"
 
+#include "psppire-dialog-action-binomial.h"
 #include "psppire-dialog-action-correlation.h"
+#include "psppire-dialog-action-crosstabs.h"
 #include "psppire-dialog-action-descriptives.h"
 #include "psppire-dialog-action-examine.h"
 #include "psppire-dialog-action-factor.h"
+#include "psppire-dialog-action-frequencies.h"
 #include "psppire-dialog-action-indep-samps.h"
 #include "psppire-dialog-action-kmeans.h"
+#include "psppire-dialog-action-logistic.h"
 #include "psppire-dialog-action-means.h"
 #include "psppire-means-layer.h"
 #include "psppire-dialog-action-rank.h"
@@ -29,6 +35,7 @@
 #include "psppire-dialog-action-var-info.h"
 #include "psppire-value-entry.h"
 
+static  volatile GType kludge;
 
 /* Any custom widgets which are to be used in GtkBuilder ui files
    need to be preregistered, otherwise GtkBuilder refuses to 
@@ -47,10 +54,14 @@ preregister_widgets (void)
   psppire_var_view_get_type ();
   psppire_value_entry_get_type ();
 
+  psppire_dialog_action_binomial_get_type ();
   psppire_dialog_action_correlation_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_frequencies_get_type ();
+  psppire_dialog_action_logistic_get_type ();
   psppire_dialog_action_kmeans_get_type ();
   psppire_dialog_action_means_get_type ();
   psppire_dialog_action_indep_samps_get_type ();
@@ -64,5 +75,5 @@ preregister_widgets (void)
 
   /* This seems to be necessary on Cygwin.
      It ought not to be necessary.  Having it here can't do any harm. */
-  gtk_source_view_get_type ();
+  kludge = gtk_source_view_get_type ();
 }