projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
helper.h
diff --git
a/src/ui/gui/helper.h
b/src/ui/gui/helper.h
index 1a620908309c3f93450dd4b90178ec1ca0001785..f6c084d48e8373d12366b24455f45267daacd89b 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.
/* 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
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,48
+24,37
@@
#include <data/value.h>
#include <gtk/gtk.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)
+#include "psppire-dict.h"
+
+void paste_syntax_in_new_window (const gchar *syntax);
struct fmt_spec;
struct fmt_spec;
+
/* Formats a value according to FORMAT
The returned string must be freed when no longer required */
/* Formats a value according to FORMAT
The returned string must be freed when no longer required */
-gchar * value_to_text (union value v, struct fmt_spec format);
+gchar * value_to_text (union value v,
const PsppireDict *dict,
struct fmt_spec format);
gboolean text_to_value (const gchar *text, union value *v,
gboolean text_to_value (const gchar *text, union value *v,
+ const PsppireDict *dict,
struct fmt_spec format);
struct fmt_spec format);
-GtkWidget * get_widget_assert (GladeXML *xml, 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);
+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 (G
ladeXML
*);
+void connect_help (G
tkBuilder
*);
void reference_manual (GtkMenuItem *, gpointer);
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))
-void marshaller_VOID__INT_INT_INT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+GtkBuilder *builder_new_real (const gchar *name);
/* Create a deep copy of SRC */
/* Create a deep copy of SRC */