Merge remote-tracking branch 'origin/master' into sheet

[pspp] / 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 a97fd4e436e2520103cd5c8f47271a0f94da202d..b4c9b09dac21251a56d6bbe2b651742e79dbed18 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -1226,11 +1226,11 @@ insert_case_at_row (PsppireDataWindow *dw)
 static void
 goto_case (PsppireDataWindow *dw)
 {
-#if SHEET_MERGE
-  PsppireDataSheet *ds = psppire_data_editor_get_active_data_sheet (dw->data_editor);
-
-  goto_case_dialog (ds);
-#endif
+  int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor));
+  if (p == 0)
+    {
+      goto_case_dialog (JMD_SHEET (dw->data_editor->data_sheet));
+    }
 }
 
 
@@ -2013,22 +2013,6 @@ psppire_data_window_for_dataset (struct dataset *ds)
   return NULL;
 }
 
-#if SHEET_MERGE
-
-PsppireDataWindow *
-psppire_data_window_for_data_store (PsppireDataStore *data_store)
-{
-  PsppireDataWindow *pdw;
-
-  ll_for_each (pdw, PsppireDataWindow, ll, &all_data_windows)
-    if (pdw->data_store == data_store)
-      return pdw;
-
-  return NULL;
-}
-
-#endif
-
 GtkWindow *
 create_data_window (void)
 {
@@ -2039,9 +2023,7 @@ create_data_window (void)
   return GTK_WINDOW (w);
 }
 
-
-
-void
+GtkWindow *
 open_data_window (PsppireWindow *victim, const char *file_name,
                   const char *encoding, gpointer hint)
 {
@@ -2058,4 +2040,5 @@ open_data_window (PsppireWindow *victim, const char *file_name,
 
   psppire_window_load (PSPPIRE_WINDOW (window), file_name, encoding, hint);
   gtk_widget_show_all (window);
+  return GTK_WINDOW (window);
 }