projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pspp-sheet-view: Make Shift+Tab select only one cell when switching rows.
[pspp]
/
src
/
ui
/
gui
/
count-dialog.c
diff --git
a/src/ui/gui/count-dialog.c
b/src/ui/gui/count-dialog.c
index 39a99dbd9d8ad2ece22839c5e3ce319d85b3c050..135cc473304fa91c43eaf9b59ea5eec75bfecafb 100644
(file)
--- a/
src/ui/gui/count-dialog.c
+++ b/
src/ui/gui/count-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
@@
-20,7
+20,7
@@
#include "count-dialog.h"
#include <gtk/gtk.h>
#include "count-dialog.h"
#include <gtk/gtk.h>
-#include "
hel
per.h"
+#include "
builder-wrap
per.h"
#include "psppire-dialog.h"
#include "psppire-selector.h"
#include "psppire-val-chooser.h"
#include "psppire-dialog.h"
#include "psppire-selector.h"
#include "psppire-val-chooser.h"
@@
-28,8
+28,10
@@
#include "psppire-acr.h"
#include "dialog-common.h"
#include "psppire-acr.h"
#include "dialog-common.h"
+
#include <ui/syntax-gen.h>
#include "executor.h"
#include <ui/syntax-gen.h>
#include "executor.h"
+#include "helper.h"
struct cnt_dialog
{
struct cnt_dialog
{
@@
-112,7
+114,6
@@
dialog_state_valid (gpointer data)
void count_dialog (PsppireDataWindow *de)
{
gint response;
void count_dialog (PsppireDataWindow *de)
{
gint response;
- PsppireVarStore *vs = NULL;
struct cnt_dialog cnt;
GtkBuilder *builder = builder_new ("count.ui");
struct cnt_dialog cnt;
GtkBuilder *builder = builder_new ("count.ui");
@@
-135,9
+136,7
@@
void count_dialog (PsppireDataWindow *de)
g_signal_connect (cnt.dialog, "refresh", G_CALLBACK (refresh), &cnt);
g_signal_connect (cnt.dialog, "refresh", G_CALLBACK (refresh), &cnt);
- g_object_get (de->data_editor, "var-store", &vs, NULL);
-
- g_object_get (vs, "dictionary", &cnt.dict, NULL);
+ g_object_get (de->data_editor, "dictionary", &cnt.dict, NULL);
gtk_window_set_transient_for (GTK_WINDOW (cnt.dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (cnt.dialog), GTK_WINDOW (de));
@@
-163,6
+162,7
@@
void count_dialog (PsppireDataWindow *de)
}
}
+ g_object_unref (cnt.value_list);
g_object_unref (builder);
}
g_object_unref (builder);
}