#include <data/settings.h>
#include "psppire-data-store.h"
+#include "psppire.h"
+#include "gl/configmake.h"
#include "xalloc.h"
#include <gettext.h>
}
value_init (val, width);
- msg_disable ();
- data_in (ss_cstr (text), UTF8, format->type, 0, 0, 0,
- dict->dict,
- val, width);
- msg_enable ();
+ free (data_in (ss_cstr (text), UTF8, format->type, val, width,
+ dict_get_encoding (dict->dict)));
return val;
}
o = gtk_builder_get_object (builder, name);
if ( !o )
- g_critical ("Object \"%s\" could not be found\n", name);
+ g_critical ("Object `%s' could not be found\n", name);
else if ( ! g_type_is_a (G_OBJECT_TYPE (o), type))
{
- g_critical ("Object \"%s\" was expected to have type %s, but in fact has type %s",
+ g_critical ("Object `%s' was expected to have type %s, but in fact has type %s",
name, g_type_name (type), G_OBJECT_TYPE_NAME (o));
}
}
-void
-reference_manual (GtkMenuItem *menu, gpointer data)
-{
- GError *err = NULL;
- gchar *cmd = g_strdup_printf ("yelp file://%s", relocate (DOCDIR "/pspp.xml"));
-
- if ( ! g_spawn_command_line_async (cmd, &err) )
- {
- msg (ME, _("Cannot open reference manual: %s. The PSPP user manual is "
- "also available at "
- "http://www.gnu.org/software/pspp/documentation.html"),
- err->message);
- }
-
- g_free (cmd);
- g_clear_error (&err);
-}
-
-
/* Create a deep copy of SRC */
GtkListStore *
clone_list_store (const GtkListStore *src)
}
-void
-paste_syntax_in_new_window (const gchar *syntax)
+
+
+static gboolean
+on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr)
+{
+ *addr = NULL;
+
+ return FALSE;
+}
+
+char *
+paste_syntax_to_window (gchar *syntax)
{
- GtkWidget *se = psppire_syntax_window_new ();
+ static GtkWidget *the_syntax_pasteboard = NULL;
+
+ GtkTextBuffer *buffer = NULL;
+
+ if ( NULL == the_syntax_pasteboard)
+ {
+ the_syntax_pasteboard = psppire_syntax_window_new ();
+ g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete),
+ &the_syntax_pasteboard);
+ }
+
+ buffer = GTK_TEXT_BUFFER (PSPPIRE_SYNTAX_WINDOW (the_syntax_pasteboard)->buffer);
+
+ gtk_text_buffer_begin_user_action (buffer);
+ gtk_text_buffer_insert_at_cursor (buffer, syntax, -1);
+ gtk_text_buffer_insert_at_cursor (buffer, "\n", 1);
+ gtk_text_buffer_end_user_action (buffer);
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
+ gtk_widget_show (the_syntax_pasteboard);
- gtk_widget_show (se);
+ return syntax;
}