X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fselect-cases-dialog.c;h=143f7a6d7f122f31144361e7e5513dd571c87a24;hb=a2bd2e76dfd5b22649c624abfe56c1d6cb14c2d9;hp=473dcdfb7ae51c0adcd742ab01cc08deaebf617d;hpb=6270a7f035e14fbad945a148a14d7c1006166eb1;p=pspp-builds.git
diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c
index 473dcdfb..143f7a6d 100644
--- a/src/ui/gui/select-cases-dialog.c
+++ b/src/ui/gui/select-cases-dialog.c
@@ -1,27 +1,23 @@
-/*
- 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 . */
#include
#include "select-cases-dialog.h"
#include
-#include
#include "helper.h"
#include "psppire-dialog.h"
#include "data-editor.h"
@@ -39,14 +35,13 @@
/* FIXME: These shouldn't be here */
-#include
#include "psppire-data-store.h"
struct select_cases_dialog
{
/* The XML that created the dialog */
- GladeXML *xml;
+ GtkBuilder *xml;
GtkWidget *spinbutton ;
GtkWidget *spinbutton1 ;
@@ -251,14 +246,9 @@ select_cases_dialog (GObject *o, gpointer data)
GtkWidget *button_range;
GtkWidget *button_sample;
- scd.xml = XML_NEW ("psppire.glade");
+ scd.xml = builder_new ("psppire.ui");
- {
- 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 +332,8 @@ select_cases_dialog (GObject *o, gpointer data)
source,
entry,
insert_source_row_into_entry,
- is_currently_in_entry);
+ is_currently_in_entry,
+ NULL);
}