X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fgoto-case-dialog.c;h=de7e97764621e23329f25b8b1cfa1587444e4ab1;hb=4246294842a8abedecaaf55aa87507225f03f58c;hp=282f41636883c21315d1f21d6ed08cfa1903a922;hpb=b6493cbb201307a2a5d1ff840a8347d75548cb85;p=pspp

diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c
index 282f416368..de7e977646 100644
--- a/src/ui/gui/goto-case-dialog.c
+++ b/src/ui/gui/goto-case-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2011, 2012  Free Software Foundation
+   Copyright (C) 2007, 2011, 2012, 2016  Free Software Foundation
 
    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
@@ -21,23 +21,20 @@
 #include "psppire-dialog.h"
 #include "psppire-data-window.h"
 #include "psppire-data-store.h"
+#include "ui/gui/efficient-sheet/jmd-sheet.h"
 
 
 static void
-refresh (PsppireDataSheet *ds, GtkBuilder *xml)
+refresh (JmdSheet *ds, GtkBuilder *xml)
 {
-  PsppireDataStore *data_store = psppire_data_sheet_get_data_store (ds);
-  casenumber case_count ;
-
   GtkWidget *case_num_entry = get_widget_assert (xml, "goto-case-case-num-entry");
-
-  case_count =  psppire_data_store_get_case_count (data_store);
+  casenumber case_count =  gtk_tree_model_iter_n_children (ds->data_model, NULL);
 
   gtk_spin_button_set_range (GTK_SPIN_BUTTON (case_num_entry), 1, case_count);
 }
 
 void
-goto_case_dialog (PsppireDataSheet *ds)
+goto_case_dialog (JmdSheet *ds)
 {
   GtkWindow *top_level;
   gint response;
@@ -51,18 +48,20 @@ goto_case_dialog (PsppireDataSheet *ds)
 
   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
 
-  if ( response == PSPPIRE_RESPONSE_GOTO )
+  if (response == PSPPIRE_RESPONSE_GOTO)
     {
-      PsppireDataStore *data_store = psppire_data_sheet_get_data_store (ds);
-      glong case_num;
       GtkWidget *case_num_entry =
-	get_widget_assert (xml, "goto-case-case-num-entry");
-
-      case_num = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (case_num_entry))
-	- FIRST_CASE_NUMBER ;
-
-      if (case_num >= 0
-          && case_num < psppire_data_store_get_case_count (data_store))
-        psppire_data_sheet_goto_case (ds, case_num);
+  	get_widget_assert (xml, "goto-case-case-num-entry");
+
+      glong case_num =
+	gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (case_num_entry))
+  	- FIRST_CASE_NUMBER ;
+
+      if (case_num >= 0 && 
+	  case_num < gtk_tree_model_iter_n_children (ds->data_model, NULL))
+      {
+	jmd_sheet_scroll_to (ds, -1, case_num);
+	jmd_sheet_set_active_cell (ds, -1, case_num, 0);
+      }
     }
 }