projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update remaining gtk_paint_focus calls to Gtk3 signature
[pspp]
/
src
/
ui
/
gui
/
t-test-one-sample.c
diff --git
a/src/ui/gui/t-test-one-sample.c
b/src/ui/gui/t-test-one-sample.c
index 5e5f35e4c7359249c6a18941c1010e4984937f04..d2bc12638363f53e5ee69db41eca0ec17118ac48 100644
(file)
--- a/
src/ui/gui/t-test-one-sample.c
+++ b/
src/ui/gui/t-test-one-sample.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007
, 2010, 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
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
@@
-20,8
+20,8
@@
#include <gtk/gtk.h>
#include "t-test-one-sample.h"
#include "psppire-dict.h"
#include <gtk/gtk.h>
#include "t-test-one-sample.h"
#include "psppire-dict.h"
-#include "psppire-var-
store
.h"
-#include "
hel
per.h"
+#include "psppire-var-
view
.h"
+#include "
builder-wrap
per.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
@@
-30,7
+30,7
@@
#include "executor.h"
#include "t-test-options.h"
#include "executor.h"
#include "t-test-options.h"
-#include
<language/syntax-string-source.h>
+#include
"helper.h"
#include <gettext.h>
#define _(msgid) gettext (msgid)
#include <gettext.h>
#define _(msgid) gettext (msgid)
@@
-58,7
+58,7
@@
generate_syntax (const struct tt_one_sample_dialog *d)
g_string_append (str, "\n\t/VARIABLES=");
g_string_append (str, "\n\t/VARIABLES=");
-
append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview), 0
);
+
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (d->vars_treeview), 0, str
);
tt_options_dialog_append_syntax (d->opt, str);
tt_options_dialog_append_syntax (d->opt, str);
@@
-119,13
+119,10
@@
dialog_state_valid (gpointer data)
/* Pops up the dialog box */
void
/* Pops up the dialog box */
void
-t_test_one_sample_dialog (
GObject *o, gpointer data
)
+t_test_one_sample_dialog (
PsppireDataWindow *de
)
{
struct tt_one_sample_dialog tt_d;
gint response;
{
struct tt_one_sample_dialog tt_d;
gint response;
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
- PsppireVarStore *vs = NULL;
GtkBuilder *xml = builder_new ("t-test.ui");
GtkBuilder *xml = builder_new ("t-test.ui");
@@
-135,33
+132,20
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
GtkWidget *options_button =
get_widget_assert (xml, "button1");
GtkWidget *options_button =
get_widget_assert (xml, "button1");
- GtkWidget *selector = get_widget_assert (xml, "psppire-selector1");
-
GtkWidget *dialog = get_widget_assert (xml, "t-test-one-sample-dialog");
GtkWidget *dialog = get_widget_assert (xml, "t-test-one-sample-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.vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
tt_d.test_value_entry = get_widget_assert (xml, "test-value-entry");
tt_d.vars_treeview = get_widget_assert (xml, "one-sample-t-test-treeview1");
tt_d.test_value_entry = get_widget_assert (xml, "test-value-entry");
- tt_d.opt = tt_options_dialog_create (
xml,
GTK_WINDOW (de));
+ tt_d.opt = tt_options_dialog_create (GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- g_object_set (dict_view, "
dictionary
",
+ g_object_set (dict_view, "
model
",
tt_d.dict,
"predicate",
var_is_numeric, NULL);
tt_d.dict,
"predicate",
var_is_numeric, NULL);
- set_dest_model (GTK_TREE_VIEW (tt_d.vars_treeview), tt_d.dict);
-
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- insert_source_row_into_tree_view,
- NULL,
- NULL);
-
-
g_signal_connect_swapped (dialog, "refresh",
G_CALLBACK (refresh), &tt_d);
g_signal_connect_swapped (dialog, "refresh",
G_CALLBACK (refresh), &tt_d);
@@
-177,23
+161,10
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&tt_d);
-
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (de, generate_syntax (&tt_d)));
break;
case PSPPIRE_RESPONSE_PASTE:
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&tt_d);
-
- paste_syntax_in_new_window (syntax);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&tt_d)));
break;
default:
break;
break;
default:
break;