/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2009, 2010 Free Software Foundation
+ Copyright (C) 2007, 2009, 2010, 2011 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
}
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));
}
GObject *o = i->data;
if ( GTK_IS_WIDGET (o) )
{
- gchar *name = NULL;
+ const gchar *name = gtk_buildable_get_name (GTK_BUILDABLE (o));
gchar s[12] = {0};
- g_object_get (o, "name", &name, NULL);
if ( name)
strncpy (s, name, 11);
return FALSE;
}
-void
-paste_syntax_to_window (const gchar *syntax)
+char *
+paste_syntax_to_window (gchar *syntax)
{
static GtkWidget *the_syntax_pasteboard = NULL;
+ GtkTextBuffer *buffer = NULL;
+
if ( NULL == the_syntax_pasteboard)
{
the_syntax_pasteboard = psppire_syntax_window_new ();
&the_syntax_pasteboard);
}
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (the_syntax_pasteboard)->buffer,
- syntax, -1);
+ buffer = GTK_TEXT_BUFFER (PSPPIRE_SYNTAX_WINDOW (the_syntax_pasteboard)->buffer);
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (the_syntax_pasteboard)->buffer,
- "\n", 1);
+ 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_widget_show (the_syntax_pasteboard);
+
+ return syntax;
}