projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NPAR TESTS: Fix "NPAR TESTS BINOMIAL, P = 0.5; N1/N2 < 1" test failure.
[pspp]
/
src
/
ui
/
gui
/
comments-dialog.c
diff --git
a/src/ui/gui/comments-dialog.c
b/src/ui/gui/comments-dialog.c
index 6b2e800779ce4a300672c75853e4a7e949a1ccb4..78cc74dea61d8500cf978d5cd8fe0e291aefcfda 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.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007
, 2010
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
@@
-18,9
+18,9
@@
#include "psppire-dialog.h"
#include "helper.h"
#include "psppire-dialog.h"
#include "helper.h"
-#include "
data-editor
.h"
-#include
<language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
psppire-data-window
.h"
+#include
"psppire-data-editor.h"
+#include "
executor
.h"
#include "psppire-var-store.h"
#include <ui/syntax-gen.h>
#include "psppire-var-store.h"
#include <ui/syntax-gen.h>
@@
-29,7
+29,6
@@
#include "dialog-common.h"
#include <gtk/gtk.h>
#include "dialog-common.h"
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <gettext.h>
#include <gettext.h>
@@
-39,7
+38,7
@@
struct comment_dialog
{
struct comment_dialog
{
- G
ladeXML
*xml;
+ G
tkBuilder
*xml;
PsppireDict *dict;
};
PsppireDict *dict;
};
@@
-91,14
+90,13
@@
wrap_line (GtkTextBuffer *buffer,
void
void
-comments_dialog (
GObject *o, gpointer data
)
+comments_dialog (
PsppireDataWindow *de
)
{
GtkTextIter iter;
gint response ;
{
GtkTextIter iter;
gint response ;
- struct data_editor *de = data;
struct comment_dialog cd;
struct comment_dialog cd;
- G
ladeXML *xml = XML_NEW ("psppire.glade
");
+ G
tkBuilder *xml = builder_new ("psppire.ui
");
GtkWidget *dialog = get_widget_assert (xml, "comments-dialog");
GtkWidget *textview = get_widget_assert (xml, "comments-textview1");
GtkWidget *dialog = get_widget_assert (xml, "comments-dialog");
GtkWidget *textview = get_widget_assert (xml, "comments-textview1");
@@
-109,7
+107,7
@@
comments_dialog (GObject *o, gpointer data)
g_object_get (de->data_editor, "var-store", &vs, NULL);
g_object_get (de->data_editor, "var-store", &vs, NULL);
- gtk_window_set_transient_for (GTK_WINDOW (dialog),
de->parent.window
);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog),
GTK_WINDOW (de)
);
{
PangoContext * context ;
{
PangoContext * context ;
@@
-145,7
+143,7
@@
comments_dialog (GObject *o, gpointer data)
}
cd.xml = xml;
}
cd.xml = xml;
-
cd.dict = vs->dict
;
+
g_object_get (vs, "dictionary", &cd.dict, NULL)
;
g_signal_connect (buffer, "mark-set",
G_CALLBACK (set_column_number), label);
g_signal_connect (buffer, "mark-set",
G_CALLBACK (set_column_number), label);
@@
-165,26
+163,10
@@
comments_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&cd);
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (generate_syntax (&cd)));
break;
case PSPPIRE_RESPONSE_PASTE:
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- 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);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&cd)));
break;
default:
break;
break;
default:
break;