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

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 25ff0aa0..946a2cfa 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  Free Software Foundation
+   Copyright (C) 2004, 2009  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
@@ -47,13 +47,14 @@ 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);
 
-GtkWidget * get_widget_assert (GladeXML *xml, const gchar *name);
+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);
 
 
-void connect_help (GladeXML *);
+void connect_help (gpointer);
 
 void reference_manual (GtkMenuItem *, gpointer);
 
@@ -64,12 +65,9 @@ gboolean execute_syntax (struct getl_interface *sss);
    glade_xml_new (relocate(PKGDATADIR "/" FILE), NULL, NULL)
 
 
-void marshaller_VOID__INT_INT_INT (GClosure     *closure,
-				   GValue       *return_value,
-				   guint         n_param_values,
-				   const GValue *param_values,
-				   gpointer      invocation_hint,
-				   gpointer      marshal_data);
+#define builder_new(NAME) builder_new_real (relocate (PKGDATADIR "/" NAME))
+
+GtkBuilder *builder_new_real (const gchar *name);
 
 
 /* Create a deep copy of SRC */