projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert variable name to utf8 before displaying in tooltips
[pspp]
/
src
/
ui
/
gui
/
crosstabs-dialog.c
diff --git
a/src/ui/gui/crosstabs-dialog.c
b/src/ui/gui/crosstabs-dialog.c
index dfe03e3c67d9ce75ad001c761c57565697a933c7..188c4aaa92c66c339c829bef59df4748f6e23516 100644
(file)
--- a/
src/ui/gui/crosstabs-dialog.c
+++ b/
src/ui/gui/crosstabs-dialog.c
@@
-26,10
+26,10
@@
#include <ui/gui/psppire-data-window.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/dict-display.h>
#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
"helper.h"
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/
psppire-syntax-window
.h>
+#include <ui/gui/
helper
.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-387,8
+387,7
@@
crosstabs_dialog (GObject *o, gpointer data)
gint response;
struct crosstabs_dialog cd;
gint response;
struct crosstabs_dialog cd;
- GladeXML *xml = XML_NEW ("crosstabs.glade");
-
+ GtkBuilder *xml = builder_new ("crosstabs.ui");
PsppireVarStore *vs = NULL;
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
PsppireVarStore *vs = NULL;
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
@@
-487,6
+486,7
@@
crosstabs_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&cd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&cd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-497,11
+497,7
@@
crosstabs_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&cd);
{
gchar *syntax = generate_syntax (&cd);
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}