X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fhelper.h;h=6bd610e7c541b2e5bd01f0a17694fa4bc8703bb4;hb=eb57e0a1240f2b528d27e9662b8b4e2310b7bcb7;hp=946a2cfad8348acbcc2e71ca8938e700cfc66f28;hpb=4398d3a1a881c6cafaeb0cbd11f56bd51d904c51;p=pspp-builds.git

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 946a2cfa..6bd610e7 100644
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -24,19 +24,11 @@
 #include <data/value.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 
 
 void paste_syntax_in_new_window (const gchar *syntax);
 
-/*
-   GtkRecentChooserMenu was added in 2.10.0
-   but it didn't support GtkRecentFilters until
-   2.10.2
-*/
-#define RECENT_LISTS_AVAILABLE GTK_CHECK_VERSION (2, 10, 2)
-
 struct fmt_spec;
 
 /* Formats a value according to FORMAT
@@ -47,23 +39,20 @@ gchar * value_to_text (union value v, struct fmt_spec format);
 gboolean text_to_value (const gchar *text, union value *v,
 		       struct fmt_spec format);
 
-GObject * get_object_assert (GtkBuilder *builder, const gchar *name);
-GtkWidget * get_widget_assert (gpointer x, const gchar *name);
-
-/* Converts a string in the pspp locale to utf-8 */
-char * pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err);
+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 (gpointer);
+void connect_help (GtkBuilder *);
 
 void reference_manual (GtkMenuItem *, gpointer);
 
 struct getl_interface;
 gboolean execute_syntax (struct getl_interface *sss);
 
-#define XML_NEW(FILE) \
-   glade_xml_new (relocate(PKGDATADIR "/" FILE), NULL, NULL)
-
 
 #define builder_new(NAME) builder_new_real (relocate (PKGDATADIR "/" NAME))