X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ffind-dialog.c;h=81aa45bea4c07e7575475b9ead40da216e044b5a;hb=db2b1501c7ef5912183d51340740dd4bd2ee45ac;hp=0fc436208f28d680bd6ce55410a1f4f9bb33e091;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp-builds.git

diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c
index 0fc43620..81aa45be 100644
--- a/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@ -47,14 +47,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 +102,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_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 +194,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 +214,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");
@@ -251,7 +250,8 @@ find_dialog (GObject *o, gpointer data)
 				 source,
 				 fd.variable_entry,
 				 insert_source_row_into_entry,
-				 is_currently_in_entry
+				 is_currently_in_entry,
+				 NULL
 				 );
 
   g_signal_connect (dialog, "refresh", G_CALLBACK (refresh),  &fd);
@@ -375,7 +375,7 @@ enum iteration_type{
   n_iterators
 };
 
-static struct casenum_iterator ip[n_iterators] =
+static const struct casenum_iterator ip[n_iterators] =
   {
     {cp1, last, forward},
     {cp1c, cm1, forward_wrap},
@@ -386,7 +386,7 @@ static struct casenum_iterator ip[n_iterators] =
 
 
 /* A factory returning an iterator according to the dialog box's settings */
-static struct casenum_iterator *
+static const struct casenum_iterator *
 get_iteration_params (const struct find_dialog *fd)
 {
   gboolean wrap = gtk_toggle_button_get_active
@@ -597,8 +597,9 @@ value_comparator_create (const struct variable *var, const char *target)
   vc->pattern = value_create (width);
 
   if ( ! data_in (ss_cstr (target),
+                  LEGACY_NATIVE,
 		  fmt->type,
-		  0, 0,
+		  0, 0, 0,
 		  vc->pattern, width) )
     {
       free (vc);
@@ -741,7 +742,7 @@ find_value (const struct find_dialog *fd, casenumber current_row,
   {
     union value *val = value_create (width);
     casenumber i;
-    struct casenum_iterator *ip = get_iteration_params (fd);
+    const struct casenum_iterator *ip = get_iteration_params (fd);
     struct comparator *cmptr =
       comparator_factory (var, target_string, flags);