X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fhelper.h;h=f7660dc43b8332f674e664202dfe76fdc198e418;hb=0655c32db3a849462fbcebd73d8c659d814e794d;hp=1a620908309c3f93450dd4b90178ec1ca0001785;hpb=2cae74e57bd1bc78f09ef0b01411d3ba83a9857d;p=pspp-builds.git

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 1a620908..f7660dc4 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, 2010  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
@@ -24,52 +24,45 @@
 #include <data/value.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
-/*
-   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)
+#include "psppire-dict.h"
 
-struct fmt_spec;
-
-/* Formats a value according to FORMAT
-   The returned string must be freed when no longer required */
-gchar * value_to_text (union value v, struct fmt_spec format);
+#include "gl/configmake.h"
 
+gchar *paste_syntax_to_window (gchar *syntax);
 
-gboolean text_to_value (const gchar *text, union value *v,
-		       struct fmt_spec format);
+struct fmt_spec;
 
-GtkWidget * get_widget_assert (GladeXML *xml, 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);
+/* 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);
 
 
-void connect_help (GladeXML *);
+union value *
+text_to_value (const gchar *text,
+	       const PsppireDict *dict,
+	       const struct variable *var,
+	       union value *);
 
-void reference_manual (GtkMenuItem *, gpointer);
+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);
 
-struct getl_interface;
-gboolean execute_syntax (struct getl_interface *sss);
+gchar * convert_glib_filename_to_system_filename (const gchar *fname,
+						  GError **err);
 
-#define XML_NEW(FILE) \
-   glade_xml_new (relocate(PKGDATADIR "/" FILE), NULL, NULL)
+void connect_help (GtkBuilder *);
 
+#define builder_new(NAME) builder_new_real (relocate (PKGDATADIR "/" NAME))
 
-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);
+GtkBuilder *builder_new_real (const gchar *name);
 
 
 /* Create a deep copy of SRC */
 GtkListStore * clone_list_store (const GtkListStore *src);
 
+void psppire_box_pack_start_defaults (GtkBox *box, GtkWidget *widget);
+
 
 #endif