X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.h;h=69841a5c491d95b42a504e02d37d6ee54851012b;hb=e784ed9c161b6b7aec1402de566e6c09cb2031e0;hp=3562ec3bfe7cb923396f8a2bb05e7a8feb54f75e;hpb=5d612c43713291cae1aa473ee3d31786ef6f5b99;p=pspp

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 3562ec3bfe..69841a5c49 100644
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -44,8 +44,6 @@ null_if_empty_param (const gchar *name, const gchar *nick,
   return param;
 }
 
-char *escape_underscores (const char *);
-
 gchar * value_to_text (union value v, const struct variable *);
 gchar * value_to_text__ (union value v, const struct fmt_spec *,
                          const char *encoding);
@@ -56,13 +54,29 @@ union value *text_to_value (const gchar *text, const struct variable *,
 union value *text_to_value__ (const gchar *text, const struct fmt_spec *,
                               const gchar *encoding, union value *);
 
-gchar * convert_glib_filename_to_system_filename (const gchar *fname,
-						  GError **err);
-
 /* Create a deep copy of SRC */
 GtkListStore * clone_list_store (const GtkListStore *src);
 
-void psppire_box_pack_start_defaults (GtkBox *box, GtkWidget *widget);
+/* gtk_box_pack_start_defaults is deprecated.
+   Therefore we roll our own until a better solution is found */
+static inline void
+psppire_box_pack_start_defaults (GtkBox *box, GtkWidget *widget)
+{
+  gtk_box_pack_start (box, widget, TRUE, TRUE, 0);
+}
 
+/* Starting with gcc8 the warning Wcast-function-type will
+   trigger if no intermediate (void (*)(void)) cast is done
+   for a function cast to GFunc when the number of parameters
+   is not 2. The reason is that the compiler behaviour in this
+   situation is undefined according to C standard although many
+   implementations rely on this. */
+#define GFUNC_COMPAT_CAST(x) ((GFunc) (void (*)(void)) (x))
+
+
+/* Return the width of an upper case M (in pixels) when rendered onto
+   WIDGET with its current style.  */
+gdouble width_of_m (GtkWidget *widget);
 
 #endif
+