undid accidental checkin of text import patch

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

diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
index 6f279e8f1c7b9121cba66c355cb31f0e3d7c2e54..2007c7bbc01c3ba5a06325cda1410b410a33e45b 100644 (file)
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -42,11 +42,11 @@
 #include "comments-dialog.h"
 #include "variable-info-dialog.h"
 #include "descriptives-dialog.h"
+#include "crosstabs-dialog.h"
 #include "frequencies-dialog.h"
 #include "dict-display.h"
 #include "clipboard.h"
 
-
 #include "oneway-anova-dialog.h"
 #include "t-test-independent-samples-dialog.h"
 #include "t-test-one-sample.h"
@@ -711,6 +711,15 @@ new_data_editor (void)
   g_signal_connect (de->invoke_frequencies_dialog, "activate",
                    G_CALLBACK (frequencies_dialog), de);
 
+  de->invoke_crosstabs_dialog =
+    gtk_action_new ("crosstabs-dialog",
+                   _("_Crosstabs"),
+                   _("Generate crosstabulations"),
+                   "pspp-crosstabs");
+
+  g_signal_connect (de->invoke_crosstabs_dialog, "activate",
+                   G_CALLBACK (crosstabs_dialog), de);
+
 
   e->window = GTK_WINDOW (get_widget_assert (de->xml, "data_editor"));
 
@@ -724,7 +733,6 @@ new_data_editor (void)
                            G_CALLBACK (gtk_action_activate),
                            de->action_data_open);
 
-
 #if RECENT_LISTS_AVAILABLE
   {
     GtkRecentManager *rm = gtk_recent_manager_get_default ();
@@ -870,6 +878,10 @@ new_data_editor (void)
                            get_widget_assert (de->xml, "analyze_descriptives")
                            );
 
+  gtk_action_connect_proxy (de->invoke_crosstabs_dialog,
+                           get_widget_assert (de->xml, "crosstabs")
+                           );
+
   gtk_action_connect_proxy (de->invoke_frequencies_dialog,
                            get_widget_assert (de->xml, "analyze_frequencies")
                            );
@@ -1201,6 +1213,7 @@ toggle_value_labels (GtkToggleAction *ta, gpointer data)
                                  gtk_toggle_action_get_active (ta));
 }
 
+extern PsppireDataStore *the_data_store ;
 
 static void
 file_quit (GtkCheckMenuItem *menuitem, gpointer data)
@@ -1208,6 +1221,7 @@ file_quit (GtkCheckMenuItem *menuitem, gpointer data)
   /* FIXME: Need to be more intelligent here.
      Give the user the opportunity to save any unsaved data.
   */
+  g_object_unref (the_data_store);
   gtk_main_quit ();
 }