Update the recommended gnulib commit, since it contains an important w32 fix

[pspp] / src / ui / gui / helper.c

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index a85b80ba584b117365c2c31c4b718749cca6124c..09bfe7acae61d81e285ab9762a1b58a93c4c1a8b 100644 (file)
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -31,7 +31,7 @@
 #include <data/casereader-provider.h>
 #include <libpspp/message.h>
 #include "psppire-syntax-window.h"
 #include <data/casereader-provider.h>
 #include <libpspp/message.h>
 #include "psppire-syntax-window.h"

-#include <gtk/gtkbuilder.h>
+#include <gtk/gtk.h>

 #include <libpspp/i18n.h>
 
 #include <ctype.h>
 #include <libpspp/i18n.h>
 
 #include <ctype.h>


@@ -47,15 +47,24 @@
 
 #include <gettext.h>
 
 
 #include <gettext.h>
 

-/* Formats a value according to FORMAT
-   The returned string must be freed when no longer required */
+/* Formats a value according to VAR's print format and strips white space
+   appropriately for VAR's type.  That is, if VAR is numeric, strips leading
+   white space (because numbers are right-justified within their fields), and
+   if VAR is string, strips trailing white space (because spaces pad out string
+   values on the right).
+
+   Returns an allocated string.  The returned string must be freed when no
+   longer required. */

 gchar *
 gchar *

-value_to_text (union value v, const PsppireDict *dict, struct fmt_spec format)
+value_to_text (union value v, const struct variable *var)

 {
 {

-  gchar *s = 0;
+  gchar *s;

 
 

-  s = data_out (&v, dict_get_encoding (dict->dict),  &format);
-  g_strchug (s);
+  s = data_out (&v, var_get_encoding (var), var_get_print_format (var));
+  if (var_is_numeric (var))
+    g_strchug (s);
+  else
+    g_strchomp (s);

 
   return s;
 }
 
   return s;
 }


@@ -65,14 +74,12 @@ value_to_text (union value v, const PsppireDict *dict, 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.
 
    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.
+   VAR must be the variable with which VAL is associated.

 
    On success, VAL is returned, NULL otherwise.
 */
 union value *
 text_to_value (const gchar *text,
 
    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)
 {
               const struct variable *var,
               union value *val)
 {


@@ -98,7 +105,7 @@ text_to_value (const gchar *text,
 
   value_init (val, width);
   free (data_in (ss_cstr (text), UTF8, format->type, val, width,
 
   value_init (val, width);
   free (data_in (ss_cstr (text), UTF8, format->type, val, width,

-                 dict_get_encoding (dict->dict)));
+                 var_get_encoding (var)));

 
   return val;
 }
 
   return val;
 }


@@ -290,7 +297,7 @@ paste_syntax_to_window (gchar *syntax)
 
   if ( NULL == the_syntax_pasteboard)
     {
 
   if ( NULL == the_syntax_pasteboard)
     {

-      the_syntax_pasteboard = psppire_syntax_window_new ();
+      the_syntax_pasteboard = psppire_syntax_window_new (NULL);

       g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete),
                        &the_syntax_pasteboard);
     }
       g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete),
                        &the_syntax_pasteboard);
     }