X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpaired-dialog.c;h=3cf2aa31d3b71e91c8305b460c585e0a1a6c8286;hb=e339b2ca72d77a076566856e9357781d49cd983c;hp=70f6c34be7297fb112b9bc86072753d7bb091dc4;hpb=422dcc73035463644b3a5e746808dc7bbbbbc45f;p=pspp diff --git a/src/ui/gui/paired-dialog.c b/src/ui/gui/paired-dialog.c index 70f6c34be7..3cf2aa31d3 100644 --- a/src/ui/gui/paired-dialog.c +++ b/src/ui/gui/paired-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2011 Free Software Foundation + Copyright (C) 2011, 2012 Free Software Foundation 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 @@ -27,7 +27,6 @@ #include "psppire-var-view.h" #include "psppire-dict.h" -#include "psppire-var-store.h" #include "dialog-common.h" #include "psppire-dialog.h" @@ -35,7 +34,7 @@ #include "psppire-var-ptr.h" -#include "helper.h" +#include "builder-wrapper.h" @@ -143,24 +142,19 @@ two_sample_dialog_destroy (struct paired_samples_dialog *psd) struct paired_samples_dialog * two_sample_dialog_create (PsppireDataWindow *de) { + GtkWidget *dict_view ; + GtkWidget *selector ; struct paired_samples_dialog *tt_d = g_malloc (sizeof *tt_d); - PsppireVarStore *vs = NULL; - tt_d->xml = builder_new ("paired-samples.ui"); - GtkWidget *dict_view = - get_widget_assert (tt_d->xml, "paired-samples-t-test-treeview1"); - - GtkWidget *options_button = get_widget_assert (tt_d->xml, "paired-samples-t-test-options-button"); + dict_view = get_widget_assert (tt_d->xml, "paired-samples-t-test-treeview1"); - GtkWidget *selector = get_widget_assert (tt_d->xml, "psppire-selector3"); + selector = get_widget_assert (tt_d->xml, "psppire-selector3"); tt_d->dialog = get_widget_assert (tt_d->xml, "t-test-paired-samples-dialog"); - g_object_get (de->data_editor, "var-store", &vs, NULL); - - g_object_get (vs, "dictionary", &tt_d->dict, NULL); + g_object_get (de->data_editor, "dictionary", &tt_d->dict, NULL); tt_d->pairs_treeview = get_widget_assert (tt_d->xml, "paired-samples-t-test-treeview2");