X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fsyntax-editor-source.c;h=214370513b7369087344f60c636f450704f3b7a7;hb=1efacfa55381cfdbd7f01006f217f1d03a4c48af;hp=289bd37a0f5cd7537a0806f1a10ccfb40e935fb8;hpb=68f08c4bb53fcde16035b622bdb6e9529f9cf3ae;p=pspp-builds.git diff --git a/src/ui/gui/syntax-editor-source.c b/src/ui/gui/syntax-editor-source.c index 289bd37a..21437051 100644 --- a/src/ui/gui/syntax-editor-source.c +++ b/src/ui/gui/syntax-editor-source.c @@ -18,7 +18,6 @@ #include #include -#include #include #include @@ -27,14 +26,17 @@ #include #include "syntax-editor-source.h" -#include "syntax-editor.h" +#include "psppire-syntax-window.h" + +#include "xalloc.h" struct syntax_editor_source { struct getl_interface parent; - const struct syntax_editor *se; + GtkTextBuffer *buffer; GtkTextIter i; GtkTextIter end; + const gchar *name; }; @@ -48,10 +50,8 @@ always_false (const struct getl_interface *i UNUSED) static const char * name (const struct getl_interface *i) { - const struct syntax_editor_source *ses = - (const struct syntax_editor_source *) i; - - return window_name ((const struct editor_window *) ses->se); + const struct syntax_editor_source *ses = (const struct syntax_editor_source *) i; + return ses->name; } @@ -80,7 +80,7 @@ read_line_from_buffer (struct getl_interface *i, next_line = ses->i; gtk_text_iter_forward_line (&next_line); - text = gtk_text_buffer_get_text (ses->se->buffer, + text = gtk_text_buffer_get_text (ses->buffer, &ses->i, &next_line, FALSE); g_strchomp (text); @@ -102,16 +102,18 @@ do_close (struct getl_interface *i ) } struct getl_interface * -create_syntax_editor_source (const struct syntax_editor *se, +create_syntax_editor_source (GtkTextBuffer *buffer, GtkTextIter start, - GtkTextIter stop + GtkTextIter stop, + const gchar *nm ) { struct syntax_editor_source *ses = xzalloc (sizeof *ses); - ses->se = se; + ses->buffer = buffer; ses->i = start; ses->end = stop; + ses->name = nm; ses->parent.interactive = always_false;