New file: builder-wrapper.h and builder-wrapper.c

Move the functions wrapping GtkBuilder out of helper.c
and into their own file.

diff --git a/src/ui/gui/aggregate-dialog.c b/src/ui/gui/aggregate-dialog.c
index b3ea30ccca7f60f7bb31e4814e0b3664302584c9..7fce9f55637481e837719c0f4a29a8a8672c76f1 100644 (file)
--- a/src/ui/gui/aggregate-dialog.c
+++ b/src/ui/gui/aggregate-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2010, 2011  Free Software Foundation
+   Copyright (C) 2010, 2011, 2012  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
@@ -35,6 +35,7 @@
 #include "dict-display.h"
 
 #include "executor.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gtk/gtk.h>

diff --git a/src/ui/gui/autorecode-dialog.c b/src/ui/gui/autorecode-dialog.c
index 6780bc7b5d420d250547b755355545471635ed76..f303e18d0f3ab4edb949ffe614d1f721ed4f21ba 100644 (file)
--- a/src/ui/gui/autorecode-dialog.c
+++ b/src/ui/gui/autorecode-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2011  Free Software Foundation
+   Copyright (C) 2011, 2012  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
@@ -27,6 +27,7 @@
 #include "psppire-var-view.h"
 
 #include "executor.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gtk/gtk.h>

diff --git a/src/ui/gui/binomial-dialog.c b/src/ui/gui/binomial-dialog.c
index 195c420193d90d2fd3a6ff487b43fd6cfc7bd150..ee3fbd7bf2cdb76c5c1c57160fceb1dcd687fba8 100644 (file)
--- a/src/ui/gui/binomial-dialog.c
+++ b/src/ui/gui/binomial-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2010, 2011  Free Software Foundation
+   Copyright (C) 2010, 2011, 2012  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
@@ -23,9 +23,9 @@
 #include "psppire-acr.h"
 #include "dialog-common.h"
 
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "executor.h"
-
+#include "helper.h"
 
 #include <gtk/gtk.h>
 

diff --git a/src/ui/gui/builder-wrapper.c b/src/ui/gui/builder-wrapper.c
new file mode 100644 (file)
index 0000000..5db4c82
--- /dev/null
+++ b/src/ui/gui/builder-wrapper.c
@@ -0,0 +1,91 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2004, 2009, 2010, 2011, 2012  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 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <config.h>
+
+#include "builder-wrapper.h"
+
+
+GtkBuilder *
+builder_new_real (const gchar *name)
+{
+  GtkBuilder *builder = gtk_builder_new ();
+
+  GError *err = NULL;
+  if ( ! gtk_builder_add_from_file (builder, name,  &err))
+    {
+      g_critical ("Couldn\'t open user interface  file %s: %s", name, err->message);
+      g_clear_error (&err);
+    }
+
+  return builder;
+}
+
+
+GtkBuilder * 
+builder_new_x (const gchar *obj_name)
+{
+  GtkBuilder *b;
+  GString *str = g_string_new (PKGDATADIR);
+  g_string_append (str, "/");
+  g_string_append (str, obj_name);
+
+  b = builder_new_real (relocate (str->str));
+
+  g_string_free (str, TRUE);
+
+  return b;
+}
+
+
+
+GObject *
+get_object_assert (GtkBuilder *builder, const gchar *name, GType type)
+{
+  GObject *o = NULL;
+  g_assert (name);
+
+  o = gtk_builder_get_object (builder, name);
+
+  if ( !o )
+    g_critical ("Object `%s' could not be found\n", name);
+  else if ( ! g_type_is_a (G_OBJECT_TYPE (o), type))
+   {
+     g_critical ("Object `%s' was expected to have type %s, but in fact has type %s", 
+       name, g_type_name (type), G_OBJECT_TYPE_NAME (o));
+   }
+
+  return o;
+}
+
+
+GtkAction *
+get_action_assert (GtkBuilder *builder, const gchar *name)
+{
+  return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION));
+}
+
+GtkWidget *
+get_widget_assert (GtkBuilder *builder, const gchar *name)
+{
+  GtkWidget *w = GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET));
+  
+  g_object_set (w, "name", name, NULL);
+
+  return w;
+}

diff --git a/src/ui/gui/builder-wrapper.h b/src/ui/gui/builder-wrapper.h
new file mode 100644 (file)
index 0000000..c5a6734
--- /dev/null
+++ b/src/ui/gui/builder-wrapper.h
@@ -0,0 +1,38 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2004, 2009, 2010, 2011, 2012  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 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.
+
+   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 _BUILDER_WRAPPER_H
+#define _BUILDER_WRAPPER_H
+
+#include <gtk/gtk.h>
+
+#include "relocatable.h"
+#include "gl/configmake.h"
+
+
+GtkBuilder *builder_new_real (const gchar *name);
+
+GtkBuilder * builder_new_x (const gchar *obj_name);
+
+#define builder_new(NAME) (builder_new_real (relocate (PKGDATADIR "/" 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);
+
+
+#endif

diff --git a/src/ui/gui/chi-square-dialog.c b/src/ui/gui/chi-square-dialog.c
index c7aaf52b4cc6e7ce514dd7464dbdb077a2d97eb1..7666cb594a82d4abcbf0158730d30e3e9b414a60 100644 (file)
--- a/src/ui/gui/chi-square-dialog.c
+++ b/src/ui/gui/chi-square-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2010, 2011  Free Software Foundation
+   Copyright (C) 2010, 2011, 2012  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
@@ -23,9 +23,9 @@
 #include "psppire-acr.h"
 #include "dialog-common.h"
 
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "executor.h"
-
+#include "helper.h"
 
 #include <gtk/gtk.h>
 

diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c
index 69a8096b24f01e11eec4a2b0bb550f16e4eff605..68249afdcb82d39cdd6a25738287714ba14ad4ed 100644 (file)
--- a/src/ui/gui/comments-dialog.c
+++ b/src/ui/gui/comments-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -17,10 +17,11 @@
 #include <config.h>
 
 #include "psppire-dialog.h"
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-data-window.h"
 #include "psppire-data-editor.h"
 #include "executor.h"
+#include "helper.h"
 #include "psppire-var-store.h"
 #include <ui/syntax-gen.h>
 

diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index 6f9ec222eb001764105850369bd8a7b6835e5b7f..b9bfa2a9d36f300c4e46b1d2306c1359b4b4ee04 100644 (file)
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -17,7 +17,7 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include "compute-dialog.h"
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-dialog.h"
 #include "psppire-keypad.h"
 #include "psppire-data-window.h"
@@ -26,8 +26,11 @@
 #include "dialog-common.h"
 #include <libpspp/i18n.h>
 
+
 #include <language/expressions/public.h>
 #include "executor.h"
+#include "helper.h"
+
 
 static void function_list_populate (GtkTreeView *tv);
 

diff --git a/src/ui/gui/correlation-dialog.c b/src/ui/gui/correlation-dialog.c
index 2e715039a9979783ea44426dcfe62b0dddc59d7e..78510dcd75d009a5514aff111c7a41e746346a78 100644 (file)
--- a/src/ui/gui/correlation-dialog.c
+++ b/src/ui/gui/correlation-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2009, 2010, 2011, 2012  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
@@ -29,6 +29,7 @@
 #include "psppire-var-view.h"
 
 #include "executor.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gtk/gtk.h>

diff --git a/src/ui/gui/count-dialog.c b/src/ui/gui/count-dialog.c
index 39a99dbd9d8ad2ece22839c5e3ce319d85b3c050..43875f963703a54f59e076b024e5a9f6a13c4f8b 100644 (file)
--- a/src/ui/gui/count-dialog.c
+++ b/src/ui/gui/count-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2011  Free Software Foundation
+   Copyright (C) 2011, 2012  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,7 +20,7 @@
 #include "count-dialog.h"
 
 #include <gtk/gtk.h>
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-dialog.h"
 #include "psppire-selector.h"
 #include "psppire-val-chooser.h"
@@ -28,8 +28,10 @@
 #include "psppire-acr.h"
 #include "dialog-common.h"
 
+
 #include <ui/syntax-gen.h>
 #include "executor.h"
+#include "helper.h"
 
 struct cnt_dialog
 {

diff --git a/src/ui/gui/crosstabs-dialog.c b/src/ui/gui/crosstabs-dialog.c
index acac2b67494849a5ff42cb342c25a7627821fb78..fa3930dc7248b3e6522f4a9d4ee2c9ef6b6fefc4 100644 (file)
--- a/src/ui/gui/crosstabs-dialog.c
+++ b/src/ui/gui/crosstabs-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010, 2011  Free Software Foundation
+   Copyright (C) 2008, 2010, 2011, 2012  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
@@ -29,7 +29,8 @@
 #include "executor.h"
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
-#include <ui/gui/helper.h>
+#include <ui/gui/builder-wrapper.h>
+#include "helper.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c
index c6343d5bbb7ccfc57d90bc64a6049a51594a5de5..670f14bac8218de452f0bfbd10117710aa838212 100644 (file)
--- a/src/ui/gui/descriptives-dialog.c
+++ b/src/ui/gui/descriptives-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -26,10 +26,11 @@
 #include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
-#include <ui/gui/helper.h>
+#include <ui/gui/builder-wrapper.h>
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
 #include "executor.h"
+#include "helper.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/ui/gui/entry-dialog.c b/src/ui/gui/entry-dialog.c
index 148af744b18560186b19d972f80d0c7e15d7dd2c..b832c86788385e4206903102b5c9a438d86458c2 100644 (file)
--- a/src/ui/gui/entry-dialog.c
+++ b/src/ui/gui/entry-dialog.c
@@ -18,7 +18,7 @@
 
 #include "ui/gui/entry-dialog.h"
 
-#include "ui/gui/helper.h"
+#include "ui/gui/builder-wrapper.h"
 #include "ui/gui/psppire-dialog.h"
 
 #include "gl/xalloc.h"

diff --git a/src/ui/gui/examine-dialog.c b/src/ui/gui/examine-dialog.c
index 7b33ac4541a975628ec63a96cf271619cb105799..857394fb3dd6ef005c058cb7d4e0d3d988e8a616 100644 (file)
--- a/src/ui/gui/examine-dialog.c
+++ b/src/ui/gui/examine-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2008, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012  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
@@ -25,10 +25,11 @@
 #include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
-#include <ui/gui/helper.h>
+#include <ui/gui/builder-wrapper.h>
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
 #include "executor.h"
+#include "helper.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/ui/gui/factor-dialog.c b/src/ui/gui/factor-dialog.c
index 26702450ef9e1153d22e0075e768c2127594a676..3385505fc388a676a7ada1ae3ef721dd55b17ab6 100644 (file)
--- a/src/ui/gui/factor-dialog.c
+++ b/src/ui/gui/factor-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2009, 2010, 2011, 2012  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
@@ -32,6 +32,7 @@
 
 #include "executor.h"
 #include "helper.h"
+#include "builder-wrapper.h"
 
 #include <gtk/gtk.h>
 

diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c
index 51645d6f62b1073614cb2b51b1ae8a3cdd695b17..0f856f94629d29c58383d9a1fc3d078015b47bf4 100644 (file)
--- a/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009, 2011  Free Software Foundation
+   Copyright (C) 2007, 2009, 2011, 2012  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
@@ -23,6 +23,7 @@ which match particular strings */
 #include "find-dialog.h"
 #include "psppire-selector.h"
 #include "psppire-dialog.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 #include "psppire-data-window.h"
 #include "dict-display.h"

diff --git a/src/ui/gui/frequencies-dialog.c b/src/ui/gui/frequencies-dialog.c
index 016682e432c19ee913a5e73473a2c255425b710e..8db8ddc88b1abb27efc4e1b04d18d9741ea368a0 100644 (file)
--- a/src/ui/gui/frequencies-dialog.c
+++ b/src/ui/gui/frequencies-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -26,10 +26,11 @@
 #include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
-#include <ui/gui/helper.h>
+#include <ui/gui/builder-wrapper.h>
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
 #include "executor.h"
+#include "helper.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c
index 832e1f2dbdfff5376f432deed5a1d03202bfeee9..1b85a53665e7817abfd169d61be3a84ee677b735 100644 (file)
--- a/src/ui/gui/goto-case-dialog.c
+++ b/src/ui/gui/goto-case-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 2012  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
@@ -17,7 +17,7 @@
 
 #include <config.h>
 #include "goto-case-dialog.h"
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-dialog.h"
 #include "psppire-data-window.h"
 #include "psppire-data-store.h"

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 3c7d7bcff072df218068595d6c8231a4535e5f0b..30f7da1f04cc6209bb4dd2517e6fad8721f089c9 100644 (file)
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011, 2012  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
@@ -111,58 +111,6 @@ text_to_value (const gchar *text,
 }
 
 
-GtkBuilder *
-builder_new_real (const gchar *name)
-{
-  GtkBuilder *builder = gtk_builder_new ();
-
-  GError *err = NULL;
-  if ( ! gtk_builder_add_from_file (builder, name,  &err))
-    {
-      g_critical ("Couldnt open user interface  file %s: %s", name, err->message);
-      g_clear_error (&err);
-    }
-
-  return builder;
-}
-
-
-GObject *
-get_object_assert (GtkBuilder *builder, const gchar *name, GType type)
-{
-  GObject *o = NULL;
-  g_assert (name);
-
-  o = gtk_builder_get_object (builder, name);
-
-  if ( !o )
-    g_critical ("Object `%s' could not be found\n", name);
-  else if ( ! g_type_is_a (G_OBJECT_TYPE (o), type))
-   {
-     g_critical ("Object `%s' was expected to have type %s, but in fact has type %s", 
-       name, g_type_name (type), G_OBJECT_TYPE_NAME (o));
-   }
-
-  return o;
-}
-
-
-GtkAction *
-get_action_assert (GtkBuilder *builder, const gchar *name)
-{
-  return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION));
-}
-
-GtkWidget *
-get_widget_assert (GtkBuilder *builder, const gchar *name)
-{
-  GtkWidget *w = GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET));
-  
-  g_object_set (w, "name", name, NULL);
-
-  return w;
-}
-
 /* This function must be used whenever a filename generated by glib,
    (eg, from gtk_file_chooser_get_filename) and passed to the C library,
    (eg through a pspp syntax string).

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 597fdd78b48171c68098950879b8379491815475..25b9d50a0cb6b52f1dc9557f77d4cdd62e3ca004 100644 (file)
--- 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, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2004, 2009, 2010, 2011, 2012  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
@@ -18,7 +18,6 @@
 #ifndef __MISC_H__
 #define __MISC_H__
 
-#include "relocatable.h"
 
 #include <data/format.h>
 #include <data/value.h>
@@ -27,8 +26,6 @@
 
 #include "psppire-dict.h"
 
-#include "gl/configmake.h"
-
 gchar *paste_syntax_to_window (gchar *syntax);
 
 struct fmt_spec;
@@ -56,19 +53,11 @@ text_to_value (const gchar *text,
               const struct variable *var,
               union value *);
 
-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);
-
 gchar * convert_glib_filename_to_system_filename (const gchar *fname,
                                                  GError **err);
 
 void connect_help (GtkBuilder *);
 
-#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);

diff --git a/src/ui/gui/k-means-dialog.c b/src/ui/gui/k-means-dialog.c
index 0b2f00fa9c9a6153415f7ed25e784d5324428d6f..329602b336814ba313cf87a0fc8c2eae4a6ce561 100644 (file)
--- a/src/ui/gui/k-means-dialog.c
+++ b/src/ui/gui/k-means-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2011  Free Software Foundation
+   Copyright (C) 2011, 2012  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
@@ -30,6 +30,7 @@
 
 #include "executor.h"
 #include "helper.h"
+#include "builder-wrapper.h"
 
 #include <gtk/gtk.h>
 

diff --git a/src/ui/gui/k-related-dialog.c b/src/ui/gui/k-related-dialog.c
index fd849005bd0b06de8f048f4d4223a5a6eb282d25..171894527cc626c0ae541736d28117b869d2a6db 100644 (file)
--- a/src/ui/gui/k-related-dialog.c
+++ b/src/ui/gui/k-related-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2010, 2011  Free Software Foundation
+   Copyright (C) 2010, 2011, 2012  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
@@ -23,9 +23,9 @@
 #include "psppire-acr.h"
 #include "dialog-common.h"
 
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "executor.h"
-
+#include "helper.h"
 
 #include <gtk/gtk.h>
 

diff --git a/src/ui/gui/ks-one-sample-dialog.c b/src/ui/gui/ks-one-sample-dialog.c
index c9a1bcbd473e7a4fb49ea183aeddf6a3ba8b6eaa..afdac0817fbb71546e8482926242dc4d9674c5b2 100644 (file)
--- a/src/ui/gui/ks-one-sample-dialog.c
+++ b/src/ui/gui/ks-one-sample-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2011  Free Software Foundation
+   Copyright (C) 2011, 2012  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
@@ -28,7 +28,9 @@
 #include "psppire-var-view.h"
 
 #include "executor.h"
+#include "builder-wrapper.h"
 #include "helper.h"
+
 #include "dialog-common.h"
 
 #include <gtk/gtk.h>

diff --git a/src/ui/gui/missing-val-dialog.c b/src/ui/gui/missing-val-dialog.c
index dbb80a2d585864b27f55b1575b906a1543ba3929..3e42036cb17260bf3c38c2c04d4ffa9cbd382c17 100644 (file)
--- a/src/ui/gui/missing-val-dialog.c
+++ b/src/ui/gui/missing-val-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2005, 2006, 2009, 2011  Free Software Foundation
+   Copyright (C) 2005, 2006, 2009, 2011, 2012  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
@@ -23,6 +23,7 @@
 #define N_(msgid) msgid
 
 
+#include "builder-wrapper.h"
 #include "helper.h"
 #include <data/format.h>
 #include "missing-val-dialog.h"

diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c
index 8b91a5134d709274d2f37d8586a0e23871e9434f..387fa4f2ec831fba2be43ad388db3a5b06cd98ff 100644 (file)
--- a/src/ui/gui/oneway-anova-dialog.c
+++ b/src/ui/gui/oneway-anova-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -21,7 +21,7 @@
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "psppire-var-view.h"
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-data-window.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
@@ -30,7 +30,7 @@
 #include "dict-display.h"
 
 #include "executor.h"
-
+#include "helper.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/ui/gui/paired-dialog.c b/src/ui/gui/paired-dialog.c
index 39a8ae91f196eb588c580d00c27917d69c9c41ad..2b61903fd9aed9ff43fdfb15c351b3d25ea06d69 100644 (file)
--- a/src/ui/gui/paired-dialog.c
+++ b/src/ui/gui/paired-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2011  Free Software Foundation
+   Copyright (C) 2011, 2012  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
@@ -35,7 +35,7 @@
 #include "psppire-var-ptr.h"
 
 
-#include "helper.h"
+#include "builder-wrapper.h"
 
 
 

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 64e044b0feb496f75aca7a0c12469f1f731ec391..b2607a0ca2dff3ded02cb242f3648d4bab1df2c1 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2012  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
@@ -27,6 +27,7 @@
 #include "ui/gui/aggregate-dialog.h"
 #include "ui/gui/autorecode-dialog.h"
 #include "ui/gui/binomial-dialog.h"
+#include "ui/gui/builder-wrapper.h"
 #include "ui/gui/chi-square-dialog.h"
 #include "ui/gui/comments-dialog.h"
 #include "ui/gui/compute-dialog.h"
@@ -43,6 +44,7 @@
 #include "ui/gui/goto-case-dialog.h"
 #include "ui/gui/help-menu.h"
 #include "ui/gui/helper.h"
+#include "ui/gui/helper.h"
 #include "ui/gui/k-means-dialog.h"
 #include "ui/gui/k-related-dialog.h"
 #include "ui/gui/npar-two-sample-related.h"

diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c
index de2490a016e5f3862d9ed32170404c8de5381e21..c5ac30b2767b7fe6c11d0de77993edc96355e4b5 100644 (file)
--- a/src/ui/gui/psppire-dialog.c
+++ b/src/ui/gui/psppire-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -23,7 +23,7 @@
 #include "psppire-selector.h"
 #include "psppire-conf.h"
 #include <string.h>
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "help-menu.h"
 
 static void psppire_dialog_class_init          (PsppireDialogClass *);

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 99a11ed52d9fe84e8c84e27e43183f25535c7f8e..29b849031b4e87ad5ad59a0d98a9da2f6482e282 100644 (file)
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2012  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
@@ -35,13 +35,15 @@
 #include "output/table-item.h"
 #include "output/text-item.h"
 #include "ui/gui/help-menu.h"
-#include "ui/gui/helper.h"
+#include "ui/gui/builder-wrapper.h"
 #include "ui/gui/psppire-output-window.h"
 
 #include "gl/error.h"
 #include "gl/tmpdir.h"
 #include "gl/xalloc.h"
 
+#include "helper.h"
+
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
@@ -180,10 +182,8 @@ expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 
   const GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (viewer));
 
-  struct text_item *text_item;
   PangoFontDescription *font_desc;
   char *font_name;
-  int font_width;
   
   gchar *fgc =
     gdk_color_to_string (&style->text[gtk_widget_get_state (GTK_WIDGET (widget))]);

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index 1ad906a18212c904e0ca72e867325736df699d3e..c68ad44553daaaa59f75def7d329ed01872ac880 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2012  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
@@ -31,6 +31,7 @@
 #include "ui/gui/executor.h"
 #include "ui/gui/help-menu.h"
 #include "ui/gui/helper.h"
+#include "ui/gui/builder-wrapper.h"
 #include "ui/gui/psppire-data-window.h"
 #include "ui/gui/psppire-encoding-selector.h"
 #include "ui/gui/psppire-lex-reader.h"

diff --git a/src/ui/gui/psppire-var-sheet.c b/src/ui/gui/psppire-var-sheet.c
index dcec70bd3af7015418adbdda45abfe8779e97548..648d9fd786ee149bdeafd7e972c382d4893dc66a 100644 (file)
--- a/src/ui/gui/psppire-var-sheet.c
+++ b/src/ui/gui/psppire-var-sheet.c
@@ -18,6 +18,7 @@
 #include "psppire-var-sheet.h"
 #include <ui/gui/sheet/psppire-axis.h>
 
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include "customentry.h"

diff --git a/src/ui/gui/rank-dialog.c b/src/ui/gui/rank-dialog.c
index 58e4f5115948a219fc59d5eb3fd3b3571399f536..23de30c019c14fc46477943f90839baba57fdb3f 100644 (file)
--- a/src/ui/gui/rank-dialog.c
+++ b/src/ui/gui/rank-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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,11 +24,12 @@
 #include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
-#include <ui/gui/helper.h>
+#include <ui/gui/builder-wrapper.h>
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
 #include <ui/gui/psppire-var-view.h>
 #include "executor.h"
+#include "helper.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/ui/gui/recode-dialog.c b/src/ui/gui/recode-dialog.c
index dc14067d0b1cd6c581d4f19a09e797e533708d43..7e85eca3f693288b6962b48810a30d16bcc5ed55 100644 (file)
--- a/src/ui/gui/recode-dialog.c
+++ b/src/ui/gui/recode-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011, 2012  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
@@ -34,7 +34,8 @@
 #include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
-#include <ui/gui/helper.h>
+#include <ui/gui/builder-wrapper.h>
+#include "helper.h"
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>
 

diff --git a/src/ui/gui/regression-dialog.c b/src/ui/gui/regression-dialog.c
index 7bea89e185a27f0f5307f9540c16204c6e69778f..ac23fb1dcb8f7cd15303991ba33e526680a4e1d3 100644 (file)
--- a/src/ui/gui/regression-dialog.c
+++ b/src/ui/gui/regression-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010, 2011  Free Software Foundation
+   Copyright (C) 2008, 2010, 2011, 2012  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
@@ -26,6 +26,7 @@
 #include <ui/gui/psppire-data-window.h>
 #include <ui/gui/dialog-common.h>
 #include <ui/gui/dict-display.h>
+#include <ui/gui/builder-wrapper.h>
 #include <ui/gui/helper.h>
 #include <ui/gui/psppire-dialog.h>
 #include <ui/gui/psppire-var-store.h>

diff --git a/src/ui/gui/reliability-dialog.c b/src/ui/gui/reliability-dialog.c
index c60f0df504968e25b66c0b670141e38b155b4fa3..c6433c1ff11eca19a839d2eaa98b2a7a42170737 100644 (file)
--- a/src/ui/gui/reliability-dialog.c
+++ b/src/ui/gui/reliability-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2009, 2010, 2011, 2012  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
@@ -26,6 +26,7 @@
 #include "psppire-var-view.h"
 
 #include "executor.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gtk/gtk.h>

diff --git a/src/ui/gui/roc-dialog.c b/src/ui/gui/roc-dialog.c
index a024c9c46dbb080f7ac2bc2057cc17659ab5b5e7..2ecb47e95d5990d704ef1fc25ae11709dd4c48ef 100644 (file)
--- a/src/ui/gui/roc-dialog.c
+++ b/src/ui/gui/roc-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2009, 2010, 2011, 2012  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
@@ -29,6 +29,7 @@
 #include "psppire-var-view.h"
 
 #include "executor.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gtk/gtk.h>

diff --git a/src/ui/gui/runs-dialog.c b/src/ui/gui/runs-dialog.c
index 2e2193730310a12a41dc64e39eb932ee90887584..6f877e827d9aeda97ed3680da5af88b7b9936e3f 100644 (file)
--- a/src/ui/gui/runs-dialog.c
+++ b/src/ui/gui/runs-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2011  Free Software Foundation
+   Copyright (C) 2011, 2012  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
@@ -29,6 +29,7 @@
 #include "psppire-var-view.h"
 
 #include "executor.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gtk/gtk.h>

diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c
index 9febcafaaa252dbb69ff950984c79640e9fcc078..be0a957f6c46e3c6e15140358bfe55945cbfe654 100644 (file)
--- a/src/ui/gui/select-cases-dialog.c
+++ b/src/ui/gui/select-cases-dialog.c
@@ -26,7 +26,9 @@
 #include "dialog-common.h"
 #include "widget-io.h"
 #include "psppire-scanf.h"
+#include "builder-wrapper.h"
 #include "helper.h"
+
 #include <xalloc.h>
 
 

diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c
index 6977469b7ecdd6b101a3058b0e40c321495d896b..62d738c96db5ee08307d4b1e02bc69f25c730176 100644 (file)
--- a/src/ui/gui/sort-cases-dialog.c
+++ b/src/ui/gui/sort-cases-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -26,14 +26,15 @@
 #include "dict-display.h"
 #include "psppire-var-view.h"
 
+#include "builder-wrapper.h"
 #include "helper.h"
 
+
 static void
 refresh (PsppireDialog *dialog, GtkTreeView *dest)
 {
   GtkTreeModel *liststore = gtk_tree_view_get_model (dest);
 
-
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
 }
 

diff --git a/src/ui/gui/split-file-dialog.c b/src/ui/gui/split-file-dialog.c
index 46758ed5b88827b2c867edfbdbb347f799d69abe..6e9259ee425113ca17fae2ca22279ed49a557da0 100644 (file)
--- a/src/ui/gui/split-file-dialog.c
+++ b/src/ui/gui/split-file-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -22,7 +22,9 @@
 #include "executor.h"
 #include "psppire-data-window.h"
 #include "dict-display.h"
+#include "builder-wrapper.h"
 #include "helper.h"
+
 #include <data/dictionary.h>
 
 #include "psppire-var-view.h"

diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c
index d4adf587d1c3858b6531bfecf9596d05d5e5baba..f83f9e0d68cf75453d3c0ec277aca2a611012193 100644 (file)
--- a/src/ui/gui/t-test-independent-samples-dialog.c
+++ b/src/ui/gui/t-test-independent-samples-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011, 2012  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
@@ -31,6 +31,7 @@
 #include "t-test-options.h"
 #include <ui/syntax-gen.h>
 
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gl/xalloc.h>

diff --git a/src/ui/gui/t-test-one-sample.c b/src/ui/gui/t-test-one-sample.c
index 477d1de5156a163bbf450a5d85f33d6e2ee50f99..02d3eff345d780631500ea0419b460b958406fb8 100644 (file)
--- a/src/ui/gui/t-test-one-sample.c
+++ b/src/ui/gui/t-test-one-sample.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -22,7 +22,7 @@
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "psppire-var-view.h"
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-data-window.h"
 #include "psppire-dialog.h"
 #include "dialog-common.h"
@@ -31,6 +31,7 @@
 #include "executor.h"
 
 #include "t-test-options.h"
+#include "helper.h"
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)

diff --git a/src/ui/gui/t-test-options.c b/src/ui/gui/t-test-options.c
index d4656bf4a457bc811a08219df7624e32ce610ca1..1caac9c0f7d27224adfa7c8f63c3c3f3046b2b08 100644 (file)
--- a/src/ui/gui/t-test-options.c
+++ b/src/ui/gui/t-test-options.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 2012  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
@@ -21,6 +21,7 @@
 
 #include "psppire-dialog.h"
 #include <gl/xalloc.h>
+#include "builder-wrapper.h"
 #include "helper.h"
 #include "t-test-options.h"
 

diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c
index a6aba1e8571f459149cb10acc23b4f5770eb968e..3f6babdf654cfd863ee053af0410c05b3cd8b457 100644 (file)
--- a/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2012  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
@@ -39,6 +39,7 @@
 #include "ui/gui/dialog-common.h"
 #include "ui/gui/executor.h"
 #include "ui/gui/helper.h"
+#include "ui/gui/builder-wrapper.h"
 #include "ui/gui/psppire-data-window.h"
 #include "ui/gui/psppire-dialog.h"
 #include "ui/gui/psppire-var-sheet.h"

diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c
index 87e3b1e4657ea169a7130a9f176a56f96a4fb932..f91b55258c1a05bbe14c57aea5bde10287978ea0 100644 (file)
--- a/src/ui/gui/transpose-dialog.c
+++ b/src/ui/gui/transpose-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -23,6 +23,7 @@
 #include "executor.h"
 #include "psppire-data-window.h"
 #include "dict-display.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include "dialog-common.h"

diff --git a/src/ui/gui/univariate-dialog.c b/src/ui/gui/univariate-dialog.c
index 2692e4880c3607948e9aed64d7b03c0a72469755..44e341a26b5c8a7466d2326b2d5f46d8b82052d7 100644 (file)
--- a/src/ui/gui/univariate-dialog.c
+++ b/src/ui/gui/univariate-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2011  Free Software Foundation
+   Copyright (C) 2011, 2012  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
@@ -17,7 +17,7 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <ui/gui/helper.h>
+#include <ui/gui/builder-wrapper.h>
 #include "psppire-dialog.h"
 #include "dict-display.h"
 
@@ -27,6 +27,7 @@
 #include <ui/gui/dialog-common.h>
 
 #include "executor.h"
+#include "helper.h"
 
 #include "univariate-dialog.h"
 

diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c
index 6126afc1dddacd5a6f6e67451c5d4977d813e36d..6b556d6de7861baa006530b2cfcf943fe0ff46d9 100644 (file)
--- a/src/ui/gui/val-labs-dialog.c
+++ b/src/ui/gui/val-labs-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2005, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2005, 2009, 2010, 2011, 2012  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
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "val-labs-dialog.h"
 #include <data/value-labels.h>
 #include <data/format.h>
@@ -30,6 +30,8 @@
 #include "psppire-var-store.h"
 #include <libpspp/i18n.h>
 
+#include "helper.h"
+
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid

diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c
index a4c2a22769c3be34911893232659125d14dd726b..fb9fc6d9f143a561be032e00fbc254cc8d88202c 100644 (file)
--- a/src/ui/gui/var-type-dialog.c
+++ b/src/ui/gui/var-type-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-    Copyright (C) 2005, 2006, 2010, 2011  Free Software Foundation
+    Copyright (C) 2005, 2006, 2010, 2011, 2012  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
@@ -28,7 +28,7 @@
 #include "data/settings.h"
 #include "data/variable.h"
 #include "libpspp/message.h"
-#include "ui/gui/helper.h"
+#include "ui/gui/builder-wrapper.h"
 #include "ui/gui/var-type-dialog.h"
 
 struct tgs

diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index d5b41a98686cb13172f22c1e1e69f2ccded41617..1cd9b1d7d1eb9ee37fe1c5d8afec4fcd8dd269fc 100644 (file)
--- a/src/ui/gui/variable-info-dialog.c
+++ b/src/ui/gui/variable-info-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2009, 2010, 2011, 2012  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
@@ -29,6 +29,7 @@
 #include "psppire-dialog.h"
 #include "psppire-dictview.h"
 #include "psppire-var-store.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 

diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c
index fa85ae4a02ce045c56af6cbc343b9a28f6b9b1f9..c19eda0d06974c3c7ea0d18adeb149fbbacf8ae7 100644 (file)
--- a/src/ui/gui/weight-cases-dialog.c
+++ b/src/ui/gui/weight-cases-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2010, 2011  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011, 2012  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
@@ -22,6 +22,7 @@
 #include "executor.h"
 #include "psppire-data-window.h"
 #include "dict-display.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gtk/gtk.h>