/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2010 Free Software Foundation
+ Copyright (C) 2007, 2010, 2011, 2012, 2013 Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <config.h>
#include "psppire-dialog.h"
-#include "helper.h"
+#include "builder-wrapper.h"
#include "psppire-data-window.h"
#include "psppire-data-editor.h"
#include "executor.h"
-#include "psppire-var-store.h"
+#include "helper.h"
#include <ui/syntax-gen.h>
#include "comments-dialog.h"
if ( chars > DOC_LINE_LENGTH )
{
GtkTextIter line_fold = *iter;
- GtkTextIter cursor;
gtk_text_iter_set_line_offset (&line_fold, DOC_LINE_LENGTH);
gtk_text_buffer_insert (buffer, &line_fold, "\r\n", 2);
-
- cursor = line_fold;
- gtk_text_iter_forward_to_line_end (&cursor);
-
- gtk_text_buffer_place_cursor (buffer, &cursor);
}
}
GtkWidget *label = get_widget_assert (xml, "column-number-label");
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
- PsppireVarStore *vs = NULL;
-
- g_object_get (de->data_editor, "var-store", &vs, NULL);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
}
cd.xml = xml;
- g_object_get (vs, "dictionary", &cd.dict, NULL);
+ g_object_get (de->data_editor, "dictionary", &cd.dict, NULL);
g_signal_connect (buffer, "mark-set",
G_CALLBACK (set_column_number), label);
switch (response)
{
case GTK_RESPONSE_OK:
- g_free (execute_syntax_string (generate_syntax (&cd)));
+ g_free (execute_syntax_string (de, generate_syntax (&cd)));
break;
case PSPPIRE_RESPONSE_PASTE:
g_free (paste_syntax_to_window (generate_syntax (&cd)));
gtk_text_buffer_set_text (buffer, "", 0);
for ( i = 0 ; i < dict_get_document_line_cnt (cd->dict->dict); ++i )
- {
- struct string str;
- ds_init_empty (&str);
- dict_get_document_line (cd->dict->dict, i, &str);
- add_line_to_buffer (buffer, ds_cstr (&str));
- ds_destroy (&str);
- }
+ add_line_to_buffer (buffer, dict_get_document_line (cd->dict->dict, i));
}
GtkWidget *tv = get_widget_assert (cd->xml, "comments-textview1");
GtkWidget *check = get_widget_assert (cd->xml, "comments-checkbutton1");
GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv));
- const char *existing_docs = dict_get_documents (cd->dict->dict);
str = g_string_new ("\n* Data File Comments.\n\n");
- if ( NULL != existing_docs)
+ if (dict_get_documents (cd->dict->dict) != NULL)
g_string_append (str, "DROP DOCUMENTS.\n");
g_string_append (str, "ADD DOCUMENT\n");