X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.h;h=7431d4c4e3fd1cdc10e4c9fa80b562bea51ab819;hb=50c7b5b389eb39accf65c8716f6a3f73b5b30aa6;hp=afd3f9f2e378aa65ffc13d499ef9d1cd91263f77;hpb=c2f62689952f31e6b4fc1a3a3a144f1324359165;p=pspp

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index afd3f9f2e3..7431d4c4e3 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, 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;
@@ -47,28 +44,23 @@ null_if_empty_param (const gchar *name, const gchar *nick,
   return param;
 }
 
+char *escape_underscores (const char *);
 
 gchar * value_to_text (union value v, const struct variable *);
+gchar * value_to_text__ (union value v, const struct fmt_spec *,
+                         const char *encoding);
 
 
-union value *
-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);
+union value *text_to_value (const gchar *text, const struct variable *,
+                            union value *);
+union value *text_to_value__ (const gchar *text, const struct fmt_spec *,
+                              const gchar *encoding, union value *);
 
 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);
@@ -76,19 +68,4 @@ GtkListStore * clone_list_store (const GtkListStore *src);
 void psppire_box_pack_start_defaults (GtkBox *box, GtkWidget *widget);
 
 
-
-
-#if ! GTK_CHECK_VERSION (2,20,0)
-static inline gboolean gtk_widget_get_realized (GtkWidget *w)
-{
-  return GTK_WIDGET_REALIZED (w);
-}
-
-static inline gboolean gtk_widget_get_mapped (GtkWidget *w)
-{
-  return GTK_WIDGET_MAPPED (w);
-}
-#endif
-
-
 #endif