X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.h;h=17e777ac9bce5c3d762abd95ec9ab142e1f81071;hb=8af88c0b7ea2fe75df7e45497988ed0371006a86;hp=079f6d925c65cd1912a7fe7cde3c7ab35675cae5;hpb=732b6a86124e89e24d685ed785d2df55728eb01b;p=pspp-builds.git

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 079f6d92..17e777ac 100644
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -1,21 +1,18 @@
-/*
-    PSPPIRE --- A Graphical User Interface for PSPP
-    Copyright (C) 2004  Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+   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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
 #ifndef __MISC_H__
@@ -23,11 +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);
+
+struct fmt_spec;
 
 /* Formats a value according to FORMAT
    The returned string must be freed when no longer required */
@@ -37,13 +39,15 @@ 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);
 
 
-void connect_help (GladeXML *);
+void connect_help (GtkBuilder *);
 
 void reference_manual (GtkMenuItem *, gpointer);
 
@@ -51,9 +55,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