X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.h;h=6bd610e7c541b2e5bd01f0a17694fa4bc8703bb4;hb=ae1be0785be76a86b0d0ace1ec820c2a4f3e313d;hp=5a245361c3ba7500e9927e7fed322dc1b0be3b13;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 5a245361..6bd610e7 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
@@ -20,20 +20,16 @@
 
 #include "relocatable.h"
 
-#include <data/value.h>
 #include <data/format.h>
+#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)
 
+void paste_syntax_in_new_window (const gchar *syntax);
+
+struct fmt_spec;
 
 /* Formats a value according to FORMAT
    The returned string must be freed when no longer required */
@@ -43,13 +39,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, GType type);
+GtkAction * get_action_assert (GtkBuilder *builder, const gchar *name);
+GtkWidget * get_widget_assert (GtkBuilder *builder, 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);
+gchar * convert_glib_filename_to_system_filename (const gchar *fname,
+						  GError **err);
 
-
-void connect_help (GladeXML *);
+void connect_help (GtkBuilder *);
 
 void reference_manual (GtkMenuItem *, gpointer);
 
@@ -57,9 +54,13 @@ 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))
+
+GtkBuilder *builder_new_real (const gchar *name);
+
 
+/* Create a deep copy of SRC */
+GtkListStore * clone_list_store (const GtkListStore *src);
 
 
 #endif