X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.h;h=25b9d50a0cb6b52f1dc9557f77d4cdd62e3ca004;hb=19277c8c5238046b3e85bb5784b5623c4802e71d;hp=ec142c8ef7f777f21810481beaef2a635e8b60c6;hpb=cd7df218e1f2798b4ac8e193558a67e6ad59e3ed;p=pspp

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index ec142c8ef7..25b9d50a0c 100644
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2004, 2009, 2010  Free Software Foundation
+   Copyright (C) 2004, 2009, 2010, 2011, 2012  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
@@ -18,7 +18,6 @@
 #ifndef __MISC_H__
 #define __MISC_H__
 
-#include "relocatable.h"
 
 #include <data/format.h>
 #include <data/value.h>
@@ -27,37 +26,38 @@
 
 #include "psppire-dict.h"
 
-#include "gl/configmake.h"
-
-void paste_syntax_in_new_window (const gchar *syntax);
+gchar *paste_syntax_to_window (gchar *syntax);
 
 struct fmt_spec;
 
+/* Returns a new GParamSpec for a string.  An attempt to store the empty string
+   in the parameter will be silently translated into storing a null pointer. */
+static inline GParamSpec *
+null_if_empty_param (const gchar *name, const gchar *nick,
+                     const gchar *blurb, const gchar *default_value,
+                     GParamFlags flags)
+{
+  GParamSpec *param;
+
+  param = g_param_spec_string (name, nick, blurb, default_value, flags);
+  ((GParamSpecString *) param)->null_fold_if_empty = TRUE;
+  return param;
+}
+
 
-/* Formats a value according to FORMAT
-   The returned string must be freed when no longer required */
-gchar * value_to_text (union value v, const PsppireDict *dict, struct fmt_spec format);
+gchar * value_to_text (union value v, const struct variable *);
 
 
 union value *
 text_to_value (const gchar *text,
-	       const PsppireDict *dict,
 	       const struct variable *var,
 	       union value *);
 
-GObject *get_object_assert (GtkBuilder *builder, const gchar *name, GType type);
-GtkAction * get_action_assert (GtkBuilder *builder, const gchar *name);
-GtkWidget * get_widget_assert (GtkBuilder *builder, const gchar *name);
-
 gchar * convert_glib_filename_to_system_filename (const gchar *fname,
 						  GError **err);
 
 void connect_help (GtkBuilder *);
 
-#define builder_new(NAME) builder_new_real (relocate (PKGDATADIR "/" NAME))
-
-GtkBuilder *builder_new_real (const gchar *name);
-
 
 /* Create a deep copy of SRC */
 GtkListStore * clone_list_store (const GtkListStore *src);