projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
[pspp-builds.git]
/
src
/
ui
/
gui
/
regression-dialog.c
diff --git
a/src/ui/gui/regression-dialog.c
b/src/ui/gui/regression-dialog.c
index 4988261ae93e4c4f3770426d858cd76c1a03c7f3..a860501805b391af6a5fbd35f684dfa55fc5aa10 100644
(file)
--- a/
src/ui/gui/regression-dialog.c
+++ b/
src/ui/gui/regression-dialog.c
@@
-29,7
+29,7
@@
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/
psppire-syntax-window
.h>
+#include <ui/gui/
helper
.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-225,9
+225,8
@@
regression_dialog (GObject *o, gpointer data)
gint response;
struct regression_dialog rd;
gint response;
struct regression_dialog rd;
- G
ladeXML *xml = XML_NEW ("regression.glade
");
+ G
tkBuilder *xml = builder_new ("regression.ui
");
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "regression-dialog");
PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "regression-dialog");
@@
-253,9
+252,7
@@
regression_dialog (GObject *o, gpointer data)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
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, "model", vs->dict, NULL);
set_dest_model (GTK_TREE_VIEW (dest_dep), vs->dict);
set_dest_model (GTK_TREE_VIEW (dest_indep), vs->dict);
set_dest_model (GTK_TREE_VIEW (dest_dep), vs->dict);
set_dest_model (GTK_TREE_VIEW (dest_indep), vs->dict);
@@
-307,6
+304,7
@@
regression_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&rd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&rd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-316,12
+314,7
@@
regression_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}