projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
ui
/
gui
/
transpose-dialog.c
diff --git
a/src/ui/gui/transpose-dialog.c
b/src/ui/gui/transpose-dialog.c
index 87e3b1e4657ea169a7130a9f176a56f96a4fb932..742dff527bd7110fb15022ee1694f7c4bb5ce7e5 100644
(file)
--- a/
src/ui/gui/transpose-dialog.c
+++ b/
src/ui/gui/transpose-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2010, 2011 Free Software Foundation
+ Copyright (C) 2007, 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
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
@@
-23,6
+23,7
@@
#include "executor.h"
#include "psppire-data-window.h"
#include "dict-display.h"
#include "executor.h"
#include "psppire-data-window.h"
#include "dict-display.h"
+#include "builder-wrapper.h"
#include "helper.h"
#include "dialog-common.h"
#include "helper.h"
#include "dialog-common.h"
@@
-35,10
+36,6
@@
#define N_(msgid) msgid
#define N_(msgid) msgid
-/* FIXME: These shouldn't be here */
-#include "psppire-var-store.h"
-
-
static gchar * generate_syntax (PsppireDict *dict, GtkBuilder *xml);
static void
static gchar * generate_syntax (PsppireDict *dict, GtkBuilder *xml);
static void
@@
-83,15
+80,11
@@
transpose_dialog (PsppireDataWindow *de)
GtkBuilder *xml = builder_new ("psppire.ui");
GtkBuilder *xml = builder_new ("psppire.ui");
- PsppireVarStore *vs = NULL;
-
GtkWidget *dialog = get_widget_assert (xml, "transpose-dialog");
GtkWidget *source = get_widget_assert (xml, "source-treeview");
GtkWidget *selector2 = get_widget_assert (xml, "psppire-selector3");
GtkWidget *dialog = get_widget_assert (xml, "transpose-dialog");
GtkWidget *source = get_widget_assert (xml, "source-treeview");
GtkWidget *selector2 = get_widget_assert (xml, "psppire-selector3");
- g_object_get (de->data_editor, "var-store", &vs, NULL);
-
- g_object_get (vs, "dictionary", &dict, NULL);
+ g_object_get (de->data_editor, "dictionary", &dict, NULL);
g_object_set (source, "model", dict, NULL);
psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2),
g_object_set (source, "model", dict, NULL);
psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2),