X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=7d2374e0967894b8cb44c3323b4f19b4455a7869;hb=9d179d5ede561c69812b3afbcd9bf58f96e99663;hp=7d0897f96ba964a7ede05f3cd433fd744f053dbb;hpb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index 7d0897f9..7d2374e0 100644
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -566,7 +566,6 @@ datum_entry_activate (GtkEntry *entry, gpointer data)
   psppire_data_store_set_string (de->data_store, text, row, column);
 }
 
-static gboolean on_data_sheet_activate (GtkWidget *sheet, gint i, gint j, PsppireDataEditor *de);
 static void on_activate (PsppireDataEditor *de);
 static void on_deactivate (PsppireDataEditor *de);
 static gboolean on_switch_page (PsppireDataEditor *de, GtkNotebookPage *p, gint pagenum, gpointer data);
@@ -662,8 +661,6 @@ init_data_sheet (PsppireDataEditor *de)
 static void
 psppire_data_editor_init (PsppireDataEditor *de)
 {
-  int i;
-
   GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
   GtkWidget *sw_vs = gtk_scrolled_window_new (NULL, NULL);
 
@@ -728,11 +725,6 @@ psppire_data_editor_init (PsppireDataEditor *de)
 			    G_CALLBACK (on_activate),
 			    de);
 
-  for (i = 0 ; i < 4 ; ++i )
-    g_signal_connect (de->data_sheet[i], "activate",
-			      G_CALLBACK (on_data_sheet_activate),
-			      de);
-
   g_signal_connect_swapped (de->data_sheet[0], "deactivate",
 			    G_CALLBACK (on_deactivate),
 			    de);
@@ -861,7 +853,9 @@ psppire_data_editor_clip_copy (PsppireDataEditor *de)
 void
 psppire_data_editor_clip_paste (PsppireDataEditor *de)
 {
-  GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  GdkDisplay *display = gtk_widget_get_display ( GTK_WIDGET (de));
+  GtkClipboard *clipboard =
+    gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
 
   gtk_clipboard_request_contents (clipboard,
 				  gdk_atom_intern ("UTF8_STRING", TRUE),
@@ -1131,25 +1125,6 @@ emit_selected_signal (PsppireDataEditor *de)
   g_signal_emit (de, data_editor_signals[DATA_SELECTION_CHANGED], 0, data_selected);
 }
 
-static gboolean
-on_data_sheet_activate (GtkWidget *sheet, gint row, gint col, PsppireDataEditor *de)
-{
-  gint i;
-
-  for ( i = 0 ; i < 4 ; ++i )
-    {
-      gint current_row, current_col;
-      if (de->data_sheet[i] == sheet) continue;
-
-      gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &current_row, &current_col);
-
-      if ( row == current_row  && current_col == col ) continue;
-
-      gtk_sheet_set_active_cell (GTK_SHEET (de->data_sheet[i]), row, col);
-    }
-
-  return TRUE;
-}
 
 static void
 on_activate (PsppireDataEditor *de)