X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcomments-dialog.c;h=49d143cb6c51f379df11ad5172c789fada53a7f6;hb=c38762e6de6a20119033f6405f05472372ec7c5a;hp=9b521a7669fb1cfbe4f6f1063807078932e42880;hpb=c7b5e2dcfaeb0221b801dc3cc9fa1ab9a4ec5861;p=pspp-builds.git diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c index 9b521a76..49d143cb 100644 --- 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 -#include "psppire-syntax-window.h" +#include "helper.h" #include "psppire-var-store.h" #include @@ -30,7 +30,6 @@ #include "dialog-common.h" #include -#include #include @@ -40,7 +39,7 @@ struct comment_dialog { - GladeXML *xml; + GtkBuilder *xml; PsppireDict *dict; }; @@ -99,7 +98,7 @@ comments_dialog (GObject *o, gpointer data) PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); struct comment_dialog cd; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("psppire.ui"); GtkWidget *dialog = get_widget_assert (xml, "comments-dialog"); GtkWidget *textview = get_widget_assert (xml, "comments-textview1"); @@ -168,6 +167,7 @@ comments_dialog (GObject *o, gpointer data) case GTK_RESPONSE_OK: { gchar *syntax = generate_syntax (&cd); + 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); - 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); }