numbers back in tables

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

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 4fc1b72beb84c7b9a1699677134715b1eab221fa..9b40c08ab5b741f819f416c81d7a34f66a2a849e 100644 (file)
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -46,26 +46,6 @@
 
 #include <gettext.h>
 
-/* Returns a copy of IN with each underscore doubled.  The caller should free
-   the returned string (with free()) when it is no longer needed. */
-char *
-escape_underscores (const char *in)
-{
-  char *out = xmalloc (2 * strlen (in) + 1);
-  char *p;
-
-  p = out;
-  for (; *in != '\0'; in++)
-    {
-      if (*in == '_')
-        *p++ = '_';
-      *p++ = *in;
-    }
-  *p = '\0';
-
-  return out;
-}
-
 /* 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
@@ -95,7 +75,8 @@ value_to_text__ (union value v,
 {
   gchar *s;
 
-  s = data_out_stretchy (&v, encoding, format, NULL);
+  s = data_out_stretchy (&v, encoding, format, settings_get_fmt_settings (),
+                         NULL);
   if (fmt_is_numeric (format->type))
     g_strchug (s);
   else
@@ -155,7 +136,8 @@ text_to_value__ (const gchar *text,
     }
 
   value_init (val, width);
-  char *err = data_in (ss_cstr (text), UTF8, format->type, val, width, encoding);
+  char *err = data_in (ss_cstr (text), UTF8, format->type,
+                       settings_get_fmt_settings (), val, width, encoding);
 
   if (err)
     {
@@ -168,32 +150,6 @@ text_to_value__ (const gchar *text,
 }
 
 
-/* This function must be used whenever a filename generated by glib,
-   (eg, from gtk_file_chooser_get_filename) and passed to the C library,
-   (eg through a pspp syntax string).
-*/
-gchar *
-convert_glib_filename_to_system_filename (const gchar *fname, GError **err)
-{
-  gchar *output_name;
-
-#ifdef G_OS_WIN32
-  const gchar *target_encoding;
-  gchar *utf8_name = NULL;
-
-  g_get_charset (&target_encoding);
-
-  output_name = g_convert (fname, -1, target_encoding,
-                       "UTF-8", NULL, NULL, err);
-#else
-  output_name = xstrdup (fname);
-#endif
-
-  return output_name;
-}
-
-
-
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
@@ -207,7 +163,6 @@ clone_list_store (const GtkListStore *src)
   const gint n_cols =  gtk_tree_model_get_n_columns (GTK_TREE_MODEL (src));
   GType *types = g_malloc (sizeof (*types) *  n_cols);
 
-  int row = 0;
   GtkListStore *dest;
 
   for (i = 0 ; i < n_cols; ++i)
@@ -232,7 +187,6 @@ clone_list_store (const GtkListStore *src)
 
          g_value_unset (&val);
        }
-      row++;
     }
 
   g_free (types);
@@ -278,10 +232,21 @@ paste_syntax_to_window (gchar *syntax)
 }
 
 
-/* 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)
+/* Return the width of an upper case M (in pixels) when rendered onto
+   WIDGET with its current style.  */
+gdouble
+width_of_m (GtkWidget *widget)
 {
-  gtk_box_pack_start (box, widget, TRUE, TRUE, 0);
+  PangoContext *context = gtk_widget_create_pango_context (widget);
+  PangoLayout *layout = pango_layout_new (context);
+  PangoRectangle rect;
+
+  pango_layout_set_text (layout, "M", 1);
+  pango_layout_get_extents (layout, NULL, &rect);
+
+  g_object_unref (G_OBJECT (layout));
+  g_object_unref (G_OBJECT (context));
+
+  return rect.width / (gdouble) PANGO_SCALE;
 }
+