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
/
split-file-dialog.c
diff --git
a/src/ui/gui/split-file-dialog.c
b/src/ui/gui/split-file-dialog.c
index 00f30c627080d53f96848d96c1c7ba4aca128ea7..458a3c53532a1eafdddbd9552f14cc4b11286ffc 100644
(file)
--- a/
src/ui/gui/split-file-dialog.c
+++ b/
src/ui/gui/split-file-dialog.c
@@
-19,11
+19,11
@@
#include "split-file-dialog.h"
#include "psppire-selector.h"
#include "psppire-dialog.h"
#include "split-file-dialog.h"
#include "psppire-selector.h"
#include "psppire-dialog.h"
-#include "
helpe
r.h"
-#include "
data-editor
.h"
+#include "
executo
r.h"
+#include "
psppire-data-window
.h"
#include "dict-display.h"
#include <language/syntax-string-source.h>
#include "dict-display.h"
#include <language/syntax-string-source.h>
-#include "
syntax-edito
r.h"
+#include "
helpe
r.h"
#include <data/dictionary.h>
#include <gtk/gtk.h>
#include <data/dictionary.h>
#include <gtk/gtk.h>
@@
-166,7
+166,7
@@
void
split_file_dialog (GObject *o, gpointer data)
{
gint response;
split_file_dialog (GObject *o, gpointer data)
{
gint response;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
struct split_file_dialog sfd;
PsppireVarStore *vs ;
struct split_file_dialog sfd;
PsppireVarStore *vs ;
@@
-191,9
+191,8
@@
split_file_dialog (GObject *o, gpointer data)
sfd.selector = PSPPIRE_SELECTOR (
get_widget_assert (sfd.xml, "split-file-selector"));
sfd.selector = PSPPIRE_SELECTOR (
get_widget_assert (sfd.xml, "split-file-selector"));
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
+ g_object_set (source, "dictionary",
+ vs->dict, NULL);
g_signal_connect (on_off, "toggled", G_CALLBACK(on_off_toggled), sfd.xml);
g_signal_connect (on_off, "toggled", G_CALLBACK(on_off_toggled), sfd.xml);
@@
-210,7
+209,7
@@
split_file_dialog (GObject *o, gpointer data)
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &sfd);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &sfd);
- gtk_window_set_transient_for (GTK_WINDOW (dialog),
de->parent.window
);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog),
GTK_WINDOW (de)
);
response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
@@
-220,6
+219,7
@@
split_file_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&sfd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&sfd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-229,11
+229,7
@@
split_file_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&sfd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&sfd);
-
- 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);
}