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
/
ks-one-sample-dialog.c
diff --git
a/src/ui/gui/ks-one-sample-dialog.c
b/src/ui/gui/ks-one-sample-dialog.c
index c9a1bcbd473e7a4fb49ea183aeddf6a3ba8b6eaa..ba27e58bf33edd3904bf5578d8085b995619afd4 100644
(file)
--- a/
src/ui/gui/ks-one-sample-dialog.c
+++ b/
src/ui/gui/ks-one-sample-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2011 Free Software Foundation
+ Copyright (C) 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
@@
-28,7
+28,9
@@
#include "psppire-var-view.h"
#include "executor.h"
#include "psppire-var-view.h"
#include "executor.h"
+#include "builder-wrapper.h"
#include "helper.h"
#include "helper.h"
+
#include "dialog-common.h"
#include <gtk/gtk.h>
#include "dialog-common.h"
#include <gtk/gtk.h>
@@
-104,8
+106,6
@@
ks_one_sample_dialog (PsppireDataWindow *dw)
struct ks_one_sample fd;
gint response;
struct ks_one_sample fd;
gint response;
- PsppireVarStore *vs;
-
GtkWidget *dialog ;
GtkWidget *source ;
GtkWidget *dialog ;
GtkWidget *source ;
@@
-126,11
+126,9
@@
ks_one_sample_dialog (PsppireDataWindow *dw)
fd.variables = get_widget_assert (fd.xml, "psppire-var-view1");
fd.variables = get_widget_assert (fd.xml, "psppire-var-view1");
- g_object_get (fd.de->data_editor, "var-store", &vs, NULL);
-
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (fd.de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (fd.de));
- g_object_get (
vs
, "dictionary", &fd.dict, NULL);
+ g_object_get (
fd.de->data_editor
, "dictionary", &fd.dict, NULL);
g_object_set (source, "model", fd.dict,
"predicate", var_is_numeric,
NULL);
g_object_set (source, "model", fd.dict,
"predicate", var_is_numeric,
NULL);