Merge commit 'HEAD'; commit 'savannah/master'

[pspp-builds.git] / src / ui / gui / helper.h

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 5a245361c3ba7500e9927e7fed322dc1b0be3b13..d388ccb41821b132afaf5670647ea3dd961a0cd4 100644 (file)
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -20,13 +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>
 
 
+
+void paste_syntax_in_new_window (const gchar *syntax);
+
 /*
    GtkRecentChooserMenu was added in 2.10.0
    but it didn't support GtkRecentFilters until
@@ -34,6 +37,7 @@
 */
 #define RECENT_LISTS_AVAILABLE GTK_CHECK_VERSION (2, 10, 2)
 
+struct fmt_spec;
 
 /* Formats a value according to FORMAT
    The returned string must be freed when no longer required */
@@ -43,7 +47,7 @@ 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);
+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);
@@ -56,10 +60,17 @@ 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))
+
+GtkBuilder *builder_new_real (const gchar *name);
+
+
+/* Create a deep copy of SRC */
+GtkListStore * clone_list_store (const GtkListStore *src);
+
 
 #endif