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 'HEAD'; commit 'master/master'
[pspp-builds.git]
/
src
/
ui
/
gui
/
select-cases-dialog.c
diff --git
a/src/ui/gui/select-cases-dialog.c
b/src/ui/gui/select-cases-dialog.c
index 143f7a6d7f122f31144361e7e5513dd571c87a24..d953308a09fbe8b27c92c84ff54c045e8eac4e27 100644
(file)
--- a/
src/ui/gui/select-cases-dialog.c
+++ b/
src/ui/gui/select-cases-dialog.c
@@
-20,12
+20,12
@@
#include <gtk/gtk.h>
#include "helper.h"
#include "psppire-dialog.h"
#include <gtk/gtk.h>
#include "helper.h"
#include "psppire-dialog.h"
-#include "
data-editor
.h"
+#include "
psppire-data-window
.h"
#include "dialog-common.h"
#include "dict-display.h"
#include "widget-io.h"
#include <language/syntax-string-source.h>
#include "dialog-common.h"
#include "dict-display.h"
#include "widget-io.h"
#include <language/syntax-string-source.h>
-#include "
syntax-edito
r.h"
+#include "
helpe
r.h"
#include <gettext.h>
#include <gettext.h>
@@
-240,7
+240,7
@@
select_cases_dialog (GObject *o, gpointer data)
gint response;
struct select_cases_dialog scd = {0,0,0,0,0,0};
GtkWidget *dialog ;
gint response;
struct select_cases_dialog scd = {0,0,0,0,0,0};
GtkWidget *dialog ;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
GtkWidget *entry = NULL;
GtkWidget *selector ;
GtkWidget *button_range;
GtkWidget *entry = NULL;
GtkWidget *selector ;
GtkWidget *button_range;
@@
-319,7
+319,7
@@
select_cases_dialog (GObject *o, gpointer data)
dialog = get_widget_assert (scd.xml, "select-cases-dialog");
dialog = get_widget_assert (scd.xml, "select-cases-dialog");
- gtk_window_set_transient_for (GTK_WINDOW (dialog),
de->parent.window
);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog),
GTK_WINDOW (de)
);
{
GtkWidget *source = get_widget_assert (scd.xml, "select-cases-treeview");
{
GtkWidget *source = get_widget_assert (scd.xml, "select-cases-treeview");
@@
-353,6
+353,7
@@
select_cases_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-362,11
+363,7
@@
select_cases_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&scd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&scd);
-
- 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);
}