Fix some compiler warnings

[pspp] / src / ui / gui / goto-case-dialog.c

diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c
index a56af78cb307cb1a5a949e8123e13274abed5008..713c1e354a5d2f5cb2b9b422f9d0066b9fe7c050 100644 (file)
--- 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  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
@@ -17,68 +17,57 @@
 
 #include <config.h>
 #include "goto-case-dialog.h"
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-dialog.h"
-#include "data-editor.h"
+#include "psppire-data-window.h"
 #include "psppire-data-store.h"
-#include <gtksheet/gtksheet.h>
+#include "psppire-data-sheet.h"
 
 
 static void
-refresh (const struct data_editor *de, GladeXML *xml)
+refresh (PsppireDataSheet *ds, GtkBuilder *xml)
 {
-  GtkSheet *data_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
+  PsppireDataStore *store = NULL;
+  g_object_get (ds, "data-model", &store, NULL);
 
-  PsppireDataStore *ds =
-    PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
+  GtkWidget *case_num_entry = get_widget_assert (xml, "goto-case-case-num-entry");
+  casenumber case_count =  gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
 
-  GtkWidget *case_num_entry =
-    get_widget_assert (xml, "goto-case-case-num-entry");
-
-  casenumber case_count =
-    psppire_data_store_get_case_count (ds);
-
-  gtk_spin_button_set_range (GTK_SPIN_BUTTON (case_num_entry),
-                            1, case_count);
+  gtk_spin_button_set_range (GTK_SPIN_BUTTON (case_num_entry), 1, case_count);
 }
 
 void
-goto_case_dialog (GObject *o, gpointer data)
+goto_case_dialog (PsppireDataSheet *ds)
 {
+  GtkWindow *top_level;
   gint response;
-  GladeXML *xml = XML_NEW ("psppire.glade");
-  struct data_editor *de = data;
-
+  GtkBuilder *xml = builder_new ("goto-case.ui");
   GtkWidget *dialog = get_widget_assert   (xml, "goto-case-dialog");
 
+  top_level = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (ds)));
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), top_level);
 
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
-
-  refresh (de, xml);
+  refresh (ds, xml);
 
   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
 
-  if ( response == PSPPIRE_RESPONSE_GOTO )
+  if (response == PSPPIRE_RESPONSE_GOTO)
     {
-      gint row, column;
-      GtkSheet *data_sheet =
-       GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
-
+      PsppireDataStore *store = NULL;
+      g_object_get (ds, "data-model", &store, NULL);
 
       GtkWidget *case_num_entry =
-       get_widget_assert (xml, "goto-case-case-num-entry");
-
-      gtk_sheet_get_active_cell (data_sheet, &row, &column);
+       get_widget_assert (xml, "goto-case-case-num-entry");
 
-      row =
+      glong case_num =
        gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (case_num_entry))
-       - FIRST_CASE_NUMBER ;
-
-      gtk_sheet_moveto (data_sheet,
-                       row, column,
-                       0.5, 0.5);
-
-      gtk_sheet_set_active_cell (data_sheet, row, column);
+       - FIRST_CASE_NUMBER ;
+
+      if (case_num >= 0 &&
+         case_num < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (ds), NULL))
+      {
+       ssw_sheet_scroll_to (SSW_SHEET (ds), -1, case_num);
+       ssw_sheet_set_active_cell (SSW_SHEET (ds), -1, case_num, 0);
+      }
     }
 }