X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=ab3b21284ec55d23968c7c0de5c3a3fa246beb52;hb=d3181522c4d8e725d417cbae655e46f660fe168e;hp=6963a4244804c7e8cfcea1f20364342b40131543;hpb=ffce2432a76f3ffbe2a19228d3b3d03613c3b4a3;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index 6963a424..ab3b2128 100644
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #include <config.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtk.h>
-#include <gtksheet/gtkextra-sheet.h>
+#include <gtk-contrib/gtkextra-sheet.h>
 #include "psppire-data-editor.h"
 #include "psppire-var-sheet.h"
 
@@ -26,7 +26,7 @@
 #include <ui/gui/sheet/psppire-axis-impl.h>
 #include "helper.h"
 
-#include <gtksheet/gtkxpaned.h>
+#include <gtk-contrib/gtkxpaned.h>
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
@@ -380,9 +380,15 @@ psppire_data_editor_set_property (GObject         *object,
       g_object_ref (de->data_store);
 
       for (i = 0 ; i < 4 ; ++i )
-	g_object_set (de->data_sheet[i],
-		      "model", de->data_store,
-		      NULL);
+	{
+	  g_object_set (de->data_sheet[i],
+			"model", de->data_store,
+			NULL);
+
+	  g_signal_connect_swapped (de->data_store->dict, "filter-changed",
+				    G_CALLBACK (gtk_widget_queue_draw),
+				    de->data_sheet[i]);
+	}
 
       g_signal_connect (de->data_store->dict, "backend-changed",
 			G_CALLBACK (new_variables_callback), de);
@@ -548,6 +554,8 @@ psppire_data_editor_class_init (PsppireDataEditorClass *klass)
   object_class->set_property = psppire_data_editor_set_property;
   object_class->get_property = psppire_data_editor_get_property;
 
+  
+
   data_store_spec =
     g_param_spec_pointer ("data-store",
 			  "Data Store",
@@ -854,11 +862,10 @@ init_data_sheet (PsppireDataEditor *de)
   de->vaxis[0] = psppire_axis_impl_new ();
   de->vaxis[1] = psppire_axis_impl_new ();
 
-  /* Txoxovhere's only one horizontal axis, since the
+  /* There's only one horizontal axis, since the
      column widths are parameters of the variables */
   de->haxis = psppire_axis_impl_new ();
 
-
   de->split = TRUE;
   de->paned = gtk_xpaned_new ();
 
@@ -990,11 +997,11 @@ psppire_data_editor_init (PsppireDataEditor *de)
 		    G_CALLBACK (on_switch_page),
 		    NULL);
 
+  g_object_set (de, "can-focus", FALSE, NULL);
 
   g_signal_connect (de, "map", G_CALLBACK (on_map), NULL);
 
 
-
   //     psppire_sheet_hide_column_titles (de->var_sheet);
   //  psppire_sheet_hide_row_titles (de->data_sheet);
 
@@ -1455,13 +1462,19 @@ static gboolean
 on_switch_page (PsppireDataEditor *de, GtkNotebookPage *p,
 		gint pagenum, gpointer data)
 {
-  if ( pagenum != PSPPIRE_DATA_EDITOR_DATA_VIEW )
+  switch (pagenum)
     {
+    case PSPPIRE_DATA_EDITOR_DATA_VIEW:
+      gtk_widget_grab_focus (de->data_vbox);
+      on_select_range (de);
+      break;
+    case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
+      gtk_widget_grab_focus (de->var_sheet);
       emit_selected_signal (de);
-      return TRUE;
-    }
-
-  on_select_range (de);
+      break;
+    default:
+      break;
+    };
 
   return TRUE;
 }
@@ -1607,16 +1620,9 @@ data_sheet_set_clip (PsppireSheet *sheet)
   writer = autopaging_writer_create (dict_get_next_value_idx (clip_dict));
   for (i = range.row0; i <= range.rowi ; ++i )
     {
-      struct ccase old;
-
-      if (psppire_data_store_get_case (ds, i, &old))
-        {
-          struct ccase new;
-
-          case_map_execute (map, &old, &new);
-          case_destroy (&old);
-          casewriter_write (writer, &new);
-        }
+      struct ccase *old = psppire_data_store_get_case (ds, i);
+      if (old != NULL)
+        casewriter_write (writer, case_map_execute (map, old));
       else
         casewriter_force_error (writer);
     }
@@ -1667,8 +1673,10 @@ clip_to_text (void)
   for (r = 0 ; r < case_cnt ; ++r )
     {
       int c;
-      struct ccase cc;
-      if ( !  casereader_peek (clip_datasheet, r, &cc))
+      struct ccase *cc;
+
+      cc = casereader_peek (clip_datasheet, r);
+      if (cc == NULL)
 	{
 	  g_warning ("Clipboard seems to have inexplicably shrunk");
 	  break;
@@ -1677,7 +1685,7 @@ clip_to_text (void)
       for (c = 0 ; c < var_cnt ; ++c)
 	{
 	  const struct variable *v = dict_get_var (clip_dict, c);
-	  data_out_g_string (string, v, &cc);
+	  data_out_g_string (string, v, cc);
 	  if ( c < val_cnt - 1 )
 	    g_string_append (string, "\t");
 	}
@@ -1685,7 +1693,7 @@ clip_to_text (void)
       if ( r < case_cnt)
 	g_string_append (string, "\n");
 
-      case_destroy (&cc);
+      case_unref (cc);
     }
 
   return string;
@@ -1710,8 +1718,8 @@ clip_to_html (void)
   for (r = 0 ; r < case_cnt ; ++r )
     {
       int c;
-      struct ccase cc;
-      if ( !  casereader_peek (clip_datasheet, r, &cc))
+      struct ccase *cc = casereader_peek (clip_datasheet, r);
+      if (cc == NULL)
 	{
 	  g_warning ("Clipboard seems to have inexplicably shrunk");
 	  break;
@@ -1722,13 +1730,13 @@ clip_to_html (void)
 	{
 	  const struct variable *v = dict_get_var (clip_dict, c);
 	  g_string_append (string, "<td>");
-	  data_out_g_string (string, v, &cc);
+	  data_out_g_string (string, v, cc);
 	  g_string_append (string, "</td>\n");
 	}
 
       g_string_append (string, "</tr>\n");
 
-      case_destroy (&cc);
+      case_unref (cc);
     }
   g_string_append (string, "</table>\n");
 
@@ -1889,5 +1897,3 @@ on_owner_change (GtkClipboard *clip, GdkEventOwnerChange *event, gpointer data)
   g_signal_emit (de, data_editor_signals[DATA_AVAILABLE_CHANGED], 0,
 		 compatible_target);
 }
-
-