X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Ft-test-independent-samples-dialog.c;h=e5a04a076a22d833a2397a9b899c97ef695860ff;hb=0f70b0dd47b62dbefe87fb08ba8a8984aa5a50c4;hp=a54a94addccebf7bf758a1d4e848cf650d126338;hpb=c7b5e2dcfaeb0221b801dc3cc9fa1ab9a4ec5861;p=pspp-builds.git diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c index a54a94ad..e5a04a07 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 -#include #include #include "t-test-independent-samples-dialog.h" #include "psppire-dict.h" @@ -32,7 +31,7 @@ #include #include -#include "psppire-syntax-window.h" +#include "helper.h" #include @@ -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"); @@ -427,9 +426,9 @@ t_test_independent_samples_dialog (GObject *o, gpointer data) gtk_window_set_transient_for (GTK_WINDOW (tt_d.dialog), GTK_WINDOW (de)); - attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view), + g_object_set (dict_view, "dictionary", vs->dict, - GTK_SELECTION_MULTIPLE, NULL); + NULL); set_dest_model (GTK_TREE_VIEW (test_variables_treeview), vs->dict); @@ -475,6 +474,7 @@ t_test_independent_samples_dialog (GObject *o, gpointer data) case GTK_RESPONSE_OK: { gchar *syntax = generate_syntax (&tt_d); + struct getl_interface *sss = create_syntax_string_source (syntax); execute_syntax (sss); @@ -484,13 +484,7 @@ t_test_independent_samples_dialog (GObject *o, gpointer data) case PSPPIRE_RESPONSE_PASTE: { gchar *syntax = generate_syntax (&tt_d); - - GtkWidget *se = psppire_syntax_window_new (); - - gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1); - - gtk_widget_show (se); - + paste_syntax_in_new_window (syntax); g_free (syntax); } break;