#include <errno.h>
-#include <gtksheet/gtksheet.h>
+#include <gtk-contrib/psppire-sheet.h>
#include <limits.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <ui/syntax-gen.h>
-#include <ui/gui/data-editor.h>
+#include <ui/gui/psppire-data-window.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-sheet.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/syntax-editor.h>
+#include <ui/gui/helper.h>
#include "error.h"
#include "xalloc.h"
struct data_editor *de = de_;
GtkWidget *dialog =
- gtk_message_dialog_new (de->parent.window,
+ gtk_message_dialog_new (GTK_WINDOW (de),
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_CLOSE,
text_data_import_assistant (GObject *o, gpointer de_)
{
struct data_editor *de = de_;
- GtkWindow *parent_window = de->parent.window;
+ GtkWindow *parent_window = GTK_WINDOW (de);
struct import_assistant *ia;
ia = xzalloc (sizeof *ia);
case PSPPIRE_RESPONSE_PASTE:
{
char *syntax = generate_syntax (ia);
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
- gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
+ paste_syntax_in_new_window (syntax);
free (syntax);
}
break;
hold a reference via ia->formats.dict. */
var_store = psppire_var_store_new (psppire_dict);
g_object_set (var_store,
- "trailing-rows", 1,
"format-type", PSPPIRE_VAR_STORE_INPUT_FORMATS,
(void *) NULL);
var_sheet = PSPPIRE_VAR_SHEET (psppire_var_sheet_new ());
g_object_set (var_sheet,
- "row-geometry", var_store,
"model", var_store,
"may-create-vars", FALSE,
(void *) NULL);
{
if (--ia->asst.watch_cursor == 0)
{
- GtkWidget *widget = GTK_WIDGET (ia->asst.assistant);;
+ GtkWidget *widget = GTK_WIDGET (ia->asst.assistant);
gdk_window_set_cursor (widget->window, NULL);
}
}