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
/
sort-cases-dialog.c
diff --git
a/src/ui/gui/sort-cases-dialog.c
b/src/ui/gui/sort-cases-dialog.c
index 4c83676f212e5f1c26784a006d647236d5e5fd66..a11356109daad8f9c4ac3a202dd382bd9a3305af 100644
(file)
--- a/
src/ui/gui/sort-cases-dialog.c
+++ b/
src/ui/gui/sort-cases-dialog.c
@@
-17,15
+17,16
@@
#include <config.h>
#include <gtk/gtk.h>
#include "sort-cases-dialog.h"
#include <config.h>
#include <gtk/gtk.h>
#include "sort-cases-dialog.h"
-#include "
helpe
r.h"
+#include "
executo
r.h"
#include "psppire-dialog.h"
#include "psppire-dialog.h"
-#include "
data-editor
.h"
+#include "
psppire-data-window
.h"
#include "psppire-var-store.h"
#include "dialog-common.h"
#include "psppire-var-store.h"
#include "dialog-common.h"
+#include "psppire-selector.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"
static void
refresh (PsppireDialog *dialog, GtkTreeView *dest)
static void
refresh (PsppireDialog *dialog, GtkTreeView *dest)
@@
-91,11
+92,11
@@
void
sort_cases_dialog (GObject *o, gpointer data)
{
gint response;
sort_cases_dialog (GObject *o, gpointer data)
{
gint response;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
struct sort_cases_dialog scd;
struct sort_cases_dialog scd;
- G
ladeXML *xml = XML_NEW ("psppire.glade
");
+ G
tkBuilder *xml = builder_new ("psppire.ui
");
GtkWidget *dialog = get_widget_assert (xml, "sort-cases-dialog");
GtkWidget *dialog = get_widget_assert (xml, "sort-cases-dialog");
@@
-108,11
+109,9
@@
sort_cases_dialog (GObject *o, gpointer data)
g_object_get (de->data_editor, "var-store", &vs, NULL);
g_object_get (de->data_editor, "var-store", &vs, NULL);
- gtk_window_set_transient_for (GTK_WINDOW (dialog),
de->parent.window
);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog),
GTK_WINDOW (de)
);
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
+ g_object_set (source, "dictionary", vs->dict, NULL);
set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
@@
-143,6
+142,7
@@
sort_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);
@@
-152,11
+152,7
@@
sort_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);
}