X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=09711f1bd1a39f4d51aa3f764fbba901ec862a58;hb=f514231dd2fc0c2adc1ebab5c46a4b55d2bd9c2b;hp=e14ab06ad76a5a7d0ebc39ef5b2f70a941de1016;hpb=9491a8bd354152d3a228e1bf041c7ad6228750d7;p=pspp
diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index e14ab06ad7..09711f1bd1 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,15 +1,33 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2007 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
+
+
/* This file is a rubbish bin where stuff gets put when it doesn't seem to
belong anywhere else.
*/
#include
+#include
+
#include
#include "helper.h"
#include "message-dialog.h"
#include
#include
#include
-#include
#include
#include
@@ -90,8 +108,9 @@ get_widget_assert (GladeXML *xml, const gchar *name)
return w;
}
-/* Converts a string in the pspp locale to utf-8 */
-char *
+/* Converts a string in the pspp locale to utf-8.
+ The return value must be freed when no longer required*/
+gchar *
pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err)
{
return recode_string (CONV_PSPP_TO_UTF8, text, len);
@@ -148,9 +167,14 @@ extern PsppireDataStore *the_data_store;
gboolean
execute_syntax (struct getl_interface *sss)
{
+ gboolean status;
struct lexer *lexer;
- g_return_val_if_fail (proc_has_source (the_dataset), FALSE);
+ struct casereader *reader = psppire_data_store_get_reader (the_data_store);
+
+ proc_set_active_file_data (the_dataset, reader);
+
+ g_return_val_if_fail (proc_has_active_file (the_dataset), FALSE);
lexer = lex_create (the_source_stream);
@@ -168,18 +192,67 @@ execute_syntax (struct getl_interface *sss)
lex_destroy (lexer);
- /* The GUI must *always* have a data source, even if it's an empty one.
- Therefore, we find that there is none, (for example NEW FILE was the last
- item in the syntax) then we create a new one. */
- if ( ! proc_has_source (the_dataset))
- proc_set_source (the_dataset,
- storage_source_create (the_data_store->case_file->flexifile)
- );
-
/* GUI syntax needs this implicit EXECUTE command at the end of
- every script. Otherwise commands like GET could leave the GUI without
- a casefile. */
- return procedure (the_dataset, NULL, NULL);
+ every script. Otherwise commands like GET could leave the GUI
+ without a datasheet. */
+ status = proc_execute (the_dataset);
+
+ psppire_dict_replace_dictionary (the_data_store->dict,
+ dataset_dict (the_dataset));
+
+ {
+ PsppireCaseFile *pcf = psppire_case_file_new (dataset_source (the_dataset));
+
+ psppire_data_store_set_case_file (the_data_store, pcf);
+ }
+
+ return status;
}
+
+#ifdef G_ENABLE_DEBUG
+# define g_marshal_value_peek_int(v) g_value_get_int (v)
+#else
+# define g_marshal_value_peek_int(v) (v)->data[0].v_int
+#endif
+
+
+/* VOID:INT,INT,INT */
+void
+marshaller_VOID__INT_INT_INT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
+ typedef void (*GMarshalFunc_VOID__INT_INT_INT) (gpointer data1,
+ gint arg_1,
+ gint arg_2,
+ gint arg_3,
+ gpointer data2);
+ register GMarshalFunc_VOID__INT_INT_INT callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1, data2;
+
+ g_return_if_fail (n_param_values == 4);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+ data1 = closure->data;
+ data2 = g_value_peek_pointer (param_values + 0);
+ }
+ else
+ {
+ data1 = g_value_peek_pointer (param_values + 0);
+ data2 = closure->data;
+ }
+ callback = (GMarshalFunc_VOID__INT_INT_INT) (marshal_data ? marshal_data : cc->callback);
+
+ callback (data1,
+ g_marshal_value_peek_int (param_values + 1),
+ g_marshal_value_peek_int (param_values + 2),
+ g_marshal_value_peek_int (param_values + 3),
+ data2);
+}