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
/
comments-dialog.c
diff --git
a/src/ui/gui/comments-dialog.c
b/src/ui/gui/comments-dialog.c
index 9b521a7669fb1cfbe4f6f1063807078932e42880..02d6d96c763d3064840fe72ebcd6d590aaa4acf7 100644
(file)
--- a/
src/ui/gui/comments-dialog.c
+++ b/
src/ui/gui/comments-dialog.c
@@
-21,7
+21,7
@@
#include "psppire-data-window.h"
#include "psppire-data-editor.h"
#include <language/syntax-string-source.h>
#include "psppire-data-window.h"
#include "psppire-data-editor.h"
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
executor
.h"
#include "psppire-var-store.h"
#include <ui/syntax-gen.h>
#include "psppire-var-store.h"
#include <ui/syntax-gen.h>
@@
-30,7
+30,6
@@
#include "dialog-common.h"
#include <gtk/gtk.h>
#include "dialog-common.h"
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <gettext.h>
#include <gettext.h>
@@
-40,7
+39,7
@@
struct comment_dialog
{
struct comment_dialog
{
- G
ladeXML
*xml;
+ G
tkBuilder
*xml;
PsppireDict *dict;
};
PsppireDict *dict;
};
@@
-99,7
+98,7
@@
comments_dialog (GObject *o, gpointer data)
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
struct comment_dialog cd;
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
struct comment_dialog cd;
- G
ladeXML *xml = XML_NEW ("psppire.glade
");
+ G
tkBuilder *xml = builder_new ("psppire.ui
");
GtkWidget *dialog = get_widget_assert (xml, "comments-dialog");
GtkWidget *textview = get_widget_assert (xml, "comments-textview1");
GtkWidget *dialog = get_widget_assert (xml, "comments-dialog");
GtkWidget *textview = get_widget_assert (xml, "comments-textview1");
@@
-146,7
+145,7
@@
comments_dialog (GObject *o, gpointer data)
}
cd.xml = xml;
}
cd.xml = xml;
-
cd.dict = vs->dict
;
+
g_object_get (vs, "dictionary", &cd.dict, NULL)
;
g_signal_connect (buffer, "mark-set",
G_CALLBACK (set_column_number), label);
g_signal_connect (buffer, "mark-set",
G_CALLBACK (set_column_number), label);
@@
-168,6
+167,7
@@
comments_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&cd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&cd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-178,11
+178,7
@@
comments_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&cd);
{
gchar *syntax = generate_syntax (&cd);
- 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);
}