X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=377f17a7f6f77dae93e73a59e02fd31a95f5ae15;hb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;hp=b4b3872df3abecf00de49e2e36979a333cb7e2f1;hpb=83df73bacd2cd3abd177e6a8ac1b76b072255025;p=pspp-builds.git

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index b4b3872d..377f17a7 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -24,7 +24,6 @@
 
 #include <glib.h>
 #include "helper.h"
-#include "message-dialog.h"
 #include <data/format.h>
 #include <data/data-in.h>
 #include <data/data-out.h>
@@ -49,7 +48,7 @@
 /* Formats a value according to FORMAT
    The returned string must be freed when no longer required */
 gchar *
-value_to_text (union value v, PsppireDict *dict, struct fmt_spec format)
+value_to_text (union value v, const PsppireDict *dict, struct fmt_spec format)
 {
   gchar *s = 0;
 
@@ -60,16 +59,27 @@ value_to_text (union value v, PsppireDict *dict, struct fmt_spec format)
 }
 
 
+/* Converts TEXT to a value.
 
-gboolean
-text_to_value (const gchar *text, union value *v,
-	      struct fmt_spec format)
+   VAL will be initialised and filled by this function.
+   It is the caller's responsibility to destroy VAL when no longer needed.
+   VAR and DICT must be the variable and dictionary with which VAL
+   is associated.
+
+   On success, VAL is returned, NULL otherwise.
+*/
+union value *
+text_to_value (const gchar *text,
+	       const PsppireDict *dict,
+	       const struct variable *var,
+	       union value *val)
 {
-  bool ok;
+  const struct fmt_spec *format = var_get_print_format (var);
+  int width = var_get_width (var);
 
-  if ( format.type != FMT_A)
+  if ( format->type != FMT_A)
     {
-      if ( ! text ) return FALSE;
+      if ( ! text ) return NULL;
 
       {
 	const gchar *s = text;
@@ -80,16 +90,18 @@ text_to_value (const gchar *text, union value *v,
 	    s++;
 	  }
 
-	if ( !*s) return FALSE;
+	if ( !*s) return NULL;
       }
     }
 
+  value_init (val, width);
   msg_disable ();
-  ok = data_in (ss_cstr (text), LEGACY_NATIVE, format.type, 0, 0, 0,
-                v, fmt_var_width (&format));
+  data_in (ss_cstr (text), UTF8, format->type, 0, 0, 0,
+		dict->dict,
+                val, width);
   msg_enable ();
 
-  return ok;
+  return val;
 }
 
 
@@ -287,3 +299,12 @@ paste_syntax_in_new_window (const gchar *syntax)
 
   gtk_widget_show (se);
 }
+
+
+/* gtk_box_pack_start_defaults is deprecated.
+   Therefore we roll our own until a better solution is found */
+void
+psppire_box_pack_start_defaults (GtkBox *box, GtkWidget *widget)
+{
+  gtk_box_pack_start (box, widget, TRUE, TRUE, 0);
+}