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
/
frequencies-dialog.c
diff --git
a/src/ui/gui/frequencies-dialog.c
b/src/ui/gui/frequencies-dialog.c
index 016682e432c19ee913a5e73473a2c255425b710e..32871e0a8b9fd5cef0535169fe07bfd2a6def52e 100644
(file)
--- a/
src/ui/gui/frequencies-dialog.c
+++ b/
src/ui/gui/frequencies-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
@@
-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/
hel
per.h>
+#include <ui/gui/
builder-wrap
per.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-dialog.h>
-#include <ui/gui/psppire-var-store.h>
#include "executor.h"
#include "executor.h"
+#include "helper.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-467,10
+467,6
@@
frequencies_dialog (PsppireDataWindow *de)
GtkWidget *charts_button = get_widget_assert (xml, "charts-button");
GtkWidget *stats_treeview = get_widget_assert (xml, "stats-treeview");
GtkWidget *charts_button = get_widget_assert (xml, "charts-button");
GtkWidget *stats_treeview = get_widget_assert (xml, "stats-treeview");
- PsppireVarStore *vs = NULL;
-
- g_object_get (de->data_editor, "var-store", &vs, NULL);
-
put_checkbox_items_in_treeview (GTK_TREE_VIEW(stats_treeview),
B_FS_DEFAULT,
N_FREQUENCY_STATS,
put_checkbox_items_in_treeview (GTK_TREE_VIEW(stats_treeview),
B_FS_DEFAULT,
N_FREQUENCY_STATS,
@@
-480,7
+476,7
@@
frequencies_dialog (PsppireDataWindow *de)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- g_object_get (
vs
, "dictionary", &fd.dict, NULL);
+ g_object_get (
de->data_editor
, "dictionary", &fd.dict, NULL);
g_object_set (source, "model", fd.dict, NULL);
fd.stat_vars = GTK_TREE_VIEW (dest);
g_object_set (source, "model", fd.dict, NULL);
fd.stat_vars = GTK_TREE_VIEW (dest);