Removed some calls to deprecated Gtk functions

[pspp-builds.git] / src / ui / gui / psppire-data-window.c

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 2707498c7929038cafc9d55f1e85f0ad93ad0272..c7631c9da42440beed850a6991fe6e62104eb76c 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -56,6 +56,9 @@
 #include "examine-dialog.h"
 #include "regression-dialog.h"
 #include "reliability-dialog.h"
+#include "roc-dialog.h"
+#include "correlation-dialog.h"
+#include "factor-dialog.h"
 #include "oneway-anova-dialog.h"
 #include "t-test-independent-samples-dialog.h"
 #include "t-test-one-sample.h"
@@ -617,8 +620,8 @@ data_save_as_dialog (PsppireDataWindow *de)
       (gtk_radio_button_get_group (GTK_RADIO_BUTTON(button_sys)),
        _("Portable File"));
 
-    gtk_box_pack_start_defaults (GTK_BOX (vbox), button_sys);
-    gtk_box_pack_start_defaults (GTK_BOX (vbox), button_por);
+    psppire_box_pack_start_defaults (GTK_BOX (vbox), button_sys);
+    psppire_box_pack_start_defaults (GTK_BOX (vbox), button_por);
 
     gtk_widget_show_all (vbox);
 
@@ -1692,6 +1695,48 @@ psppire_data_window_init (PsppireDataWindow *de)
                      G_CALLBACK (reliability_dialog), de);
   }
 
+  {
+    GtkAction *invoke_roc_dialog =
+      resolve_action (de->builder, "roc-curve", NULL);
+
+    g_object_set (invoke_roc_dialog,
+                 "tooltip", _("ROC Curve"),
+                 "stock-id", "pspp-roc",
+                 NULL
+                 );
+
+    g_signal_connect (invoke_roc_dialog, "activate",
+                     G_CALLBACK (roc_dialog), de);
+  }
+
+  {
+    GtkAction *invoke_correlation_dialog =
+      resolve_action (de->builder, "correlation", NULL);
+
+    g_object_set (invoke_correlation_dialog,
+                 "tooltip", _("Bivariate Correlation"),
+                 "stock-id", "pspp-correlation",
+                 NULL
+                 );
+
+    g_signal_connect (invoke_correlation_dialog, "activate",
+                     G_CALLBACK (correlation_dialog), de);
+  }
+
+  {
+    GtkAction *invoke_factor_dialog =
+      resolve_action (de->builder, "factor-analysis", NULL);
+
+    g_object_set (invoke_factor_dialog,
+                 "tooltip", _("Principal Axis Factoring and Principal Components Analysis"),
+                 "stock-id", "pspp-factor",
+                 NULL
+                 );
+
+    g_signal_connect (invoke_factor_dialog, "activate",
+                     G_CALLBACK (factor_dialog), de);
+  }
+
 
   {
     GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));