From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 4 Jan 2009 06:03:02 +0000 (+0900)
Subject: Converted T-Test dialogs to GtkBuilder
X-Git-Tag: v0.7.1~18
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4a503e1d9999103164767b20230f7ea38fd198c;p=pspp-builds.git

Converted T-Test dialogs to GtkBuilder
---

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 23deed95..d043b1a4 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -72,7 +72,8 @@ nodist_src_ui_gui_psppire_DATA = \
 	$(top_srcdir)/src/ui/gui/oneway.ui \
 	$(top_srcdir)/src/ui/gui/rank.ui \
 	$(top_srcdir)/src/ui/gui/recode.ui \
-	$(top_srcdir)/src/ui/gui/regression.ui
+	$(top_srcdir)/src/ui/gui/regression.ui \
+	$(top_srcdir)/src/ui/gui/t-test.ui
 
 EXTRA_DIST += \
 	$(top_srcdir)/src/ui/gui/crosstabs.glade \
@@ -82,7 +83,8 @@ EXTRA_DIST += \
 	$(top_srcdir)/src/ui/gui/oneway.glade \
 	$(top_srcdir)/src/ui/gui/rank.glade \
 	$(top_srcdir)/src/ui/gui/recode.glade \
-	$(top_srcdir)/src/ui/gui/regression.glade
+	$(top_srcdir)/src/ui/gui/regression.glade \
+	$(top_srcdir)/src/ui/gui/t-test.glade
 
 dist_src_ui_gui_psppire_DATA = \
 	$(top_srcdir)/src/ui/gui/data-editor.glade \
@@ -91,7 +93,6 @@ dist_src_ui_gui_psppire_DATA = \
 	$(top_srcdir)/src/ui/gui/psppire.glade \
 	$(top_srcdir)/src/ui/gui/syntax-editor.glade \
 	$(top_srcdir)/src/ui/gui/text-data-import.glade \
-	$(top_srcdir)/src/ui/gui/t-test.glade \
 	$(top_srcdir)/src/ui/gui/psppicon.png \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
 	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c
index 9c3ea41d..22b4526c 100644
--- a/src/ui/gui/t-test-independent-samples-dialog.c
+++ b/src/ui/gui/t-test-independent-samples-dialog.c
@@ -17,7 +17,6 @@
 
 
 #include <config.h>
-#include <glade/glade.h>
 #include <gtk/gtk.h>
 #include "t-test-independent-samples-dialog.h"
 #include "psppire-dict.h"
@@ -91,7 +90,7 @@ tt_groups_dialog_destroy (struct tt_groups_dialog *grps)
 }
 
 static struct tt_groups_dialog *
-tt_groups_dialog_create (GladeXML *xml, GtkWindow *parent)
+tt_groups_dialog_create (GtkBuilder *xml, GtkWindow *parent)
 {
   struct tt_groups_dialog *grps = xmalloc (sizeof (*grps));
 
@@ -127,7 +126,7 @@ tt_groups_dialog_create (GladeXML *xml, GtkWindow *parent)
 
 struct tt_indep_samples_dialog
 {
-  GladeXML *xml;  /* The xml that generated the widgets */
+  GtkBuilder *xml;  /* The xml that generated the widgets */
   GtkWidget *dialog;
   PsppireDict *dict;
   GtkWidget *define_groups_button;
@@ -396,7 +395,7 @@ t_test_independent_samples_dialog (GObject *o, gpointer data)
 
   PsppireVarStore *vs = NULL;
 
-  GladeXML *xml = XML_NEW ("t-test.glade");
+  GtkBuilder *xml = builder_new ("t-test.ui");
 
   GtkWidget *dict_view =
     get_widget_assert (xml, "indep-samples-t-test-treeview1");
diff --git a/src/ui/gui/t-test-one-sample.c b/src/ui/gui/t-test-one-sample.c
index ccecb075..98d9601b 100644
--- a/src/ui/gui/t-test-one-sample.c
+++ b/src/ui/gui/t-test-one-sample.c
@@ -17,7 +17,6 @@
 
 
 #include <config.h>
-#include <glade/glade.h>
 #include <gtk/gtk.h>
 #include "t-test-one-sample.h"
 #include "psppire-dict.h"
@@ -128,7 +127,7 @@ t_test_one_sample_dialog (GObject *o, gpointer data)
 
   PsppireVarStore *vs = NULL;
 
-  GladeXML *xml = XML_NEW ("t-test.glade");
+  GtkBuilder *xml = builder_new ("t-test.ui");
 
   GtkWidget *dict_view =
     get_widget_assert (xml, "one-sample-t-test-treeview2");
diff --git a/src/ui/gui/t-test-paired-samples.c b/src/ui/gui/t-test-paired-samples.c
index e89e6d74..ec709603 100644
--- a/src/ui/gui/t-test-paired-samples.c
+++ b/src/ui/gui/t-test-paired-samples.c
@@ -17,7 +17,6 @@
 
 #include <config.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <language/syntax-string-source.h>
 
 #include "data-editor.h"
@@ -187,7 +186,7 @@ t_test_paired_samples_dialog (GObject *o, gpointer data)
 
   PsppireVarStore *vs = NULL;
 
-  GladeXML *xml = XML_NEW ("t-test.glade");
+  GtkBuilder *xml = builder_new ("t-test.ui");
 
   GtkWidget *dict_view =
     get_widget_assert (xml, "paired-samples-t-test-treeview1");