Remove unnecessary dependencies on gtksheet.h

[pspp-builds.git] / src / ui / gui / select-cases-dialog.c

diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c
index 1546da82c0fa81716dbca2cd3b1a19e8440294bd..b05610e666e668dbd324efcdf1474b20916f6f8e 100644 (file)
--- a/src/ui/gui/select-cases-dialog.c
+++ b/src/ui/gui/select-cases-dialog.c
@@ -39,7 +39,6 @@
 
 
 /* FIXME: These shouldn't be here */
-#include <gtksheet/gtksheet.h>
 #include "psppire-data-store.h"
 
 
@@ -174,13 +173,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 +224,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 +252,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 +336,8 @@ select_cases_dialog (GObject *o, gpointer data)
                                   source,
                                   entry,
                                   insert_source_row_into_entry,
-                                  is_currently_in_entry);
+                                  is_currently_in_entry,
+                                  NULL);
   }