#include "descriptives-dialog.h"
#include "crosstabs-dialog.h"
#include "frequencies-dialog.h"
-#include "text-data-import-dialog.h"
#include "dict-display.h"
#include "clipboard.h"
G_CALLBACK (open_syntax_window),
e->window);
- g_signal_connect_swapped (get_widget_assert (de->xml,"file_import-text"),
- "activate",
- G_CALLBACK (gtk_action_activate),
- de->invoke_text_import_assistant);
-
g_signal_connect_swapped (get_widget_assert (de->xml,"file_save"),
"activate",
G_CALLBACK (gtk_action_activate),
g_signal_connect (de->action_data_new, "activate",
G_CALLBACK (new_file), de);
-
- de->invoke_text_import_assistant =
- gtk_action_new ("file_import-text",
- _("_Import Text Data"),
- _("Import text data file"),
- "");
-
- g_signal_connect (de->invoke_text_import_assistant, "activate",
- G_CALLBACK (text_data_import_assistant), de);
}
/* Returns true if NAME has a suffix which might denote a PSPP file */
static gint
update_data_ref_entry (const GtkSheet *sheet, gint row, gint col, gpointer data)
{
+ GtkEntry *datum_entry;
GladeXML *data_editor_xml = data;
PsppireDataStore *data_store =
g_return_val_if_fail (data_editor_xml, FALSE);
+
+ datum_entry =
+ GTK_ENTRY (get_widget_assert (data_editor_xml,
+ "datum_entry"));
+
if (data_store)
{
const struct variable *var =
GtkEntry *cell_ref_entry =
GTK_ENTRY (get_widget_assert (data_editor_xml,
"cell_ref_entry"));
- GtkEntry *datum_entry =
- GTK_ENTRY (get_widget_assert (data_editor_xml,
- "datum_entry"));
-
if ( var )
{
gchar *text = g_strdup_printf ("%d: %s", row + FIRST_CASE_NUMBER,
g_free (s);
}
else
- gtk_entry_set_text (cell_ref_entry, "");
-
+ goto blank_entry;
if ( var )
{
gchar *text =
psppire_data_store_get_string (data_store, row,
var_get_dict_index(var));
+
+ if ( ! text )
+ goto blank_entry;
+
g_strchug (text);
gtk_entry_set_text (datum_entry, text);
free (text);
}
else
- gtk_entry_set_text (datum_entry, "");
+ goto blank_entry;
+
}
return FALSE;
+
+ blank_entry:
+ gtk_entry_set_text (datum_entry, "");
+
+ return FALSE;
}