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 'HEAD'; commit 'master/master'
[pspp-builds.git]
/
src
/
ui
/
gui
/
compute-dialog.c
diff --git
a/src/ui/gui/compute-dialog.c
b/src/ui/gui/compute-dialog.c
index 96ea6630885b08fedf74a9b42d655fa94e18f333..7269ab79750e76c3ed2cf5c7431045d5506545c3 100644
(file)
--- a/
src/ui/gui/compute-dialog.c
+++ b/
src/ui/gui/compute-dialog.c
@@
-47,7
+47,7
@@
static void insert_source_row_into_text_view (GtkTreeIter iter,
struct compute_dialog
{
struct compute_dialog
{
- G
ladeXML
*xml; /* The xml that generated the widgets */
+ G
tkBuilder
*xml; /* The xml that generated the widgets */
PsppireDict *dict;
gboolean use_type;
};
PsppireDict *dict;
gboolean use_type;
};
@@
-113,7
+113,7
@@
erase_selection (GtkTextBuffer *buffer)
static void
on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data)
{
static void
on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data)
{
- G
ladeXML
*xml = data;
+ G
tkBuilder
*xml = data;
GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
@@
-137,7
+137,7
@@
on_keypad_button (PsppireKeypad *kp, const gchar *syntax, gpointer data)
static void
erase (PsppireKeypad *kp, gpointer data)
{
static void
erase (PsppireKeypad *kp, gpointer data)
{
- G
ladeXML
*xml = data;
+ G
tkBuilder
*xml = data;
GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
GtkWidget *rhs = get_widget_assert (xml, "compute-textview1");
@@
-370,7
+370,7
@@
compute_dialog (GObject *o, gpointer data)
PsppireVarStore *vs = NULL;
struct compute_dialog scd;
PsppireVarStore *vs = NULL;
struct compute_dialog scd;
- G
ladeXML *xml = XML_NEW ("psppire.glade
");
+ G
tkBuilder *xml = builder_new ("psppire.ui
");
GtkWidget *dialog = get_widget_assert (xml, "compute-variable-dialog");
GtkWidget *dialog = get_widget_assert (xml, "compute-variable-dialog");