projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
oneway-anova-dialog.c
diff --git
a/src/ui/gui/oneway-anova-dialog.c
b/src/ui/gui/oneway-anova-dialog.c
index 59b65b4a2487dfc1ce793381d407cc1e6cb402f9..a17a93977e612db7fa99b9eb58226fd9b91f72c8 100644
(file)
--- a/
src/ui/gui/oneway-anova-dialog.c
+++ b/
src/ui/gui/oneway-anova-dialog.c
@@
-22,15
+22,16
@@
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "helper.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "helper.h"
-#include "
data-editor
.h"
+#include "
psppire-data-window
.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
-#include "dict-display.h"
#include "psppire-acr.h"
#include "psppire-acr.h"
+#include "psppire-selector.h"
+#include "dict-display.h"
#include <language/syntax-string-source.h>
#include <language/syntax-string-source.h>
-#include "
syntax-edi
tor.h"
+#include "
execu
tor.h"
#include "gettext.h"
#include "gettext.h"
@@
-126,7
+127,7
@@
void
oneway_anova_dialog (GObject *o, gpointer data)
{
gint response;
oneway_anova_dialog (GObject *o, gpointer data)
{
gint response;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
PsppireVarStore *vs = NULL;
PsppireVarStore *vs = NULL;
@@
-168,11
+169,9
@@
oneway_anova_dialog (GObject *o, gpointer data)
ow.dialog =
GTK_WINDOW (get_widget_assert (builder, "oneway-anova-dialog"));
ow.dialog =
GTK_WINDOW (get_widget_assert (builder, "oneway-anova-dialog"));
- gtk_window_set_transient_for (ow.dialog,
de->parent.window
);
+ gtk_window_set_transient_for (ow.dialog,
GTK_WINDOW (de)
);
- attach_dictionary_to_treeview (GTK_TREE_VIEW (dict_view),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
+ g_object_set (dict_view, "dictionary", vs->dict, NULL);
set_dest_model (GTK_TREE_VIEW (ow.vars_treeview), vs->dict);
set_dest_model (GTK_TREE_VIEW (ow.vars_treeview), vs->dict);
@@
-222,7
+221,7
@@
oneway_anova_dialog (GObject *o, gpointer data)
psppire_acr_set_entry (cd->acr, entry);
gtk_window_set_transient_for (GTK_WINDOW (cd->contrasts_dialog),
psppire_acr_set_entry (cd->acr, entry);
gtk_window_set_transient_for (GTK_WINDOW (cd->contrasts_dialog),
-
de->parent.window
);
+
GTK_WINDOW (de)
);
}
response = psppire_dialog_run (PSPPIRE_DIALOG (ow.dialog));
}
response = psppire_dialog_run (PSPPIRE_DIALOG (ow.dialog));
@@
-232,6
+231,7
@@
oneway_anova_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&ow);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&ow);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-241,11
+241,7
@@
oneway_anova_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&ow);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&ow);
-
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
- gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}