#include <errno.h>
#include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
#include <gtk/gtk.h>
#include <limits.h>
#include <stdlib.h>
#include "libpspp/i18n.h"
#include "libpspp/line-reader.h"
#include "libpspp/message.h"
-#include "ui/gui/checkbox-treeview.h"
#include "ui/gui/dialog-common.h"
#include "ui/gui/executor.h"
#include "ui/gui/helper.h"
#include "ui/gui/psppire-encoding-selector.h"
#include "ui/gui/psppire-empty-list-store.h"
#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-var-store.h"
#include "ui/gui/psppire-scanf.h"
#include "ui/syntax-gen.h"
-#include "gl/error.h"
#include "gl/intprops.h"
#include "gl/xalloc.h"
GtkWidget *quote_combo;
GtkEntry *quote_entry;
GtkWidget *escape_cb;
- GtkTreeView *fields_tree_view;
+ PsppSheetView *fields_tree_view;
};
/* The "separators" page of the assistant. */
#define SEPARATOR_CNT (sizeof separators / sizeof *separators)
static void
-set_quote_list (GtkComboBoxEntry *cb)
+set_quote_list (GtkComboBox *cb)
{
GtkListStore *list = gtk_list_store_new (1, G_TYPE_STRING);
GtkTreeIter iter;
gtk_combo_box_set_model (GTK_COMBO_BOX (cb), GTK_TREE_MODEL (list));
g_object_unref (list);
- gtk_combo_box_entry_set_text_column (cb, 0);
+ gtk_combo_box_set_entry_text_column (cb, 0);
}
/* Initializes IA's separators substructure. */
p->quote_cb = get_widget_assert (builder, "quote-cb");
p->escape_cb = get_widget_assert (builder, "escape");
- set_quote_list (GTK_COMBO_BOX_ENTRY (p->quote_combo));
- p->fields_tree_view = GTK_TREE_VIEW (get_widget_assert (builder, "fields"));
+ set_quote_list (GTK_COMBO_BOX (p->quote_combo));
+ p->fields_tree_view = PSPP_SHEET_VIEW (get_widget_assert (builder, "fields"));
g_signal_connect (p->quote_combo, "changed",
G_CALLBACK (on_quote_combo_change), ia);
g_signal_connect (p->quote_cb, "toggled",
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (s->quote_cb)))
{
- gchar *text = gtk_combo_box_get_active_text (
- GTK_COMBO_BOX (s->quote_combo));
+ const gchar *text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (s->quote_combo))));
ds_assign_cstr (&s->quotes, text);
- g_free (text);
}
else
ds_clear (&s->quotes);