X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ffind-dialog.c;h=66d3a2cd19709e8c92be02564749bfa41b6cde94;hb=7f37cbe10c05cf3b046452691eb4a3d821c3ae7c;hp=088cac8db69979535adaa024a307aa2898041d92;hpb=0bd0098aec2ee31d9460c8d4c1263d0b5ccc4324;p=pspp-builds.git

diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c
index 088cac8d..66d3a2cd 100644
--- a/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@ -27,6 +27,7 @@ which match particular strings */
 #include "data-editor.h"
 #include "dict-display.h"
 #include <data/value.h>
+#include <data/format.h>
 #include <data/datasheet.h>
 #include <data/data-in.h>
 #include "psppire-data-store.h"
@@ -47,14 +48,12 @@ which match particular strings */
 
 
 /* FIXME: These shouldn't be here */
-#include <gtksheet/gtksheet.h>
 #include "psppire-var-store.h"
 
 struct find_dialog
 {
   GladeXML *xml;
   PsppireDict *dict;
-  GtkSheet *data_sheet;
   struct datasheet *data;
   struct data_editor *de;
   GtkWidget *variable_entry;
@@ -104,22 +103,27 @@ do_find (GObject *obj, const struct find_dialog *fd)
 {
   casenumber x = -1;
   gint column = -1;
-  gint row;
-  gtk_sheet_get_active_cell (fd->data_sheet, &row, NULL);
+  glong row;
+
+  g_object_get (fd->de->data_editor, "current-case", &row, NULL);
 
   if ( row < 0 )
     row = 0;
 
   find_value (fd, row, &x, &column);
 
+
   if ( x != -1)
     {
-      data_editor_select_sheet (fd->de, PAGE_DATA_SHEET);
-
-      gtk_sheet_moveto (fd->data_sheet, x, column, 0.5, 0.5);
+      gtk_notebook_set_current_page (GTK_NOTEBOOK (fd->de->data_editor),
+				     PSPPIRE_DATA_EDITOR_DATA_VIEW);
 
-      gtk_sheet_set_active_cell (fd->data_sheet, x, column);
+      g_object_set (fd->de->data_editor,
+		    "current-case", x,
+		    "current-variable", column,
+		    NULL);
     }
+
 }
 
 /* Callback on the selector.
@@ -191,11 +195,9 @@ find_dialog (GObject *o, gpointer data)
   GtkWidget *selector;
   GtkWidget *find_button;
 
-  GtkSheet *var_sheet;
-  GtkSheet *data_sheet ;
   GtkWidget *buttonbox;
 
-  PsppireVarStore *vs  ;
+  PsppireVarStore *vs ;
   PsppireDataStore *ds ;
 
   fd.xml = XML_NEW ("psppire.glade");
@@ -213,15 +215,13 @@ find_dialog (GObject *o, gpointer data)
   source = get_widget_assert (fd.xml, "find-variable-treeview");
   selector = get_widget_assert (fd.xml, "find-selector");
 
-  var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-  data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
-
-  vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
-  ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
+  g_object_get (de->data_editor,
+		"var-store", &vs,
+		"data-store", &ds,
+		NULL);
 
   fd.dict = vs->dict;
   fd.data = ds->case_file->datasheet;
-  fd.data_sheet = data_sheet;
 
   fd.variable_entry        = get_widget_assert (fd.xml, "find-variable-entry");
   fd.value_entry           = get_widget_assert (fd.xml, "find-value-entry");
@@ -464,7 +464,7 @@ value_compare (const struct comparator *cmptr,
 	       const union value *v)
 {
   const struct value_comparator *vc = (const struct value_comparator *) cmptr;
-  return 0 == compare_values (v, vc->pattern, var_get_width (cmptr->var));
+  return 0 == value_compare_3way (v, vc->pattern, var_get_width (cmptr->var));
 }
 
 
@@ -600,7 +600,7 @@ value_comparator_create (const struct variable *var, const char *target)
   if ( ! data_in (ss_cstr (target),
                   LEGACY_NATIVE,
 		  fmt->type,
-		  0, 0,
+		  0, 0, 0,
 		  vc->pattern, width) )
     {
       free (vc);