X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fselect-cases-dialog.c;h=f241c79d3558bcda1ec38f294f76f7a81373131d;hb=015e221b0f8578afee769528572c76387f26c629;hp=1546da82c0fa81716dbca2cd3b1a19e8440294bd;hpb=0085c7edf6d3b9c9ee2ce880893023c567886101;p=pspp

diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c
index 1546da82c0..f241c79d35 100644
--- a/src/ui/gui/select-cases-dialog.c
+++ b/src/ui/gui/select-cases-dialog.c
@@ -1,21 +1,18 @@
-/*
-    PSPPIRE --- A Graphical User Interface for PSPP
-    Copyright (C) 2007  Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2007, 2008 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -39,7 +36,6 @@
 
 
 /* FIXME: These shouldn't be here */
-#include <gtksheet/gtksheet.h>
 #include "psppire-data-store.h"
 
 
@@ -174,13 +170,13 @@ sample_subdialog (GtkButton *b, gpointer data)
       if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (percent)))
 	{
 	  text = widget_printf (gettext(label1), scd->spinbutton);
-	  gtk_label_set (GTK_LABEL (l0), text);
+	  gtk_label_set_text (GTK_LABEL (l0), text);
 	}
       else
 	{
 	  text =
 	    widget_printf (gettext(label2), scd->spinbutton1, scd->spinbutton2);
-	  gtk_label_set (GTK_LABEL (l0), text);
+	  gtk_label_set_text (GTK_LABEL (l0), text);
 
 	}
       g_free (text);
@@ -225,7 +221,7 @@ range_subdialog (GtkButton *b, gpointer data)
       GtkWidget *l1 = get_widget_assert (scd->xml, "range-sample-label");
       gchar *text = widget_printf (_("%d thru %d"), first, last);
 
-      gtk_label_set (GTK_LABEL (l1), text);
+      gtk_label_set_text (GTK_LABEL (l1), text);
 
       g_free (text);
     }
@@ -253,12 +249,7 @@ select_cases_dialog (GObject *o, gpointer data)
 
   scd.xml = XML_NEW ("psppire.glade");
 
-  {
-    GtkSheet *data_sheet =
-      GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
-
-    scd.data_store = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
-  }
+  g_object_get (de->data_editor, "data-store", &scd.data_store, NULL);
 
   button_range = get_widget_assert (scd.xml, "button-range");
   button_sample = get_widget_assert (scd.xml, "button-sample");
@@ -342,7 +333,8 @@ select_cases_dialog (GObject *o, gpointer data)
 				   source,
 				   entry,
 				   insert_source_row_into_entry,
-				   is_currently_in_entry);
+				   is_currently_in_entry,
+				   NULL);
   }