projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppireKeypad: Correct the attachment of buttons to the grid.
[pspp]
/
src
/
ui
/
gui
/
weight-cases-dialog.c
diff --git
a/src/ui/gui/weight-cases-dialog.c
b/src/ui/gui/weight-cases-dialog.c
index 066c5e54e1b27d9a2e5d2278d56f4cd7a82a5cf3..af2740abaf95f165dc429fdfaa0ef0f46e479b7b 100644
(file)
--- a/
src/ui/gui/weight-cases-dialog.c
+++ b/
src/ui/gui/weight-cases-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2010 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
@@
-22,6
+22,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 <gtk/gtk.h>
#include "helper.h"
#include <gtk/gtk.h>
@@
-31,8
+32,6
@@
#define N_(msgid) msgid
#define N_(msgid) msgid
-#include "psppire-var-store.h"
-
struct weight_cases_dialog
{
PsppireDict *dict;
struct weight_cases_dialog
{
PsppireDict *dict;
@@
-106,7
+105,7
@@
weight_cases_dialog (PsppireDataWindow *de)
gint response;
struct weight_cases_dialog wcd;
gint response;
struct weight_cases_dialog wcd;
- GtkBuilder *xml = builder_new ("
psppire
.ui");
+ GtkBuilder *xml = builder_new ("
weight
.ui");
GtkWidget *dialog = get_widget_assert (xml, "weight-cases-dialog");
GtkWidget *source = get_widget_assert (xml, "weight-cases-treeview");
GtkWidget *dialog = get_widget_assert (xml, "weight-cases-dialog");
GtkWidget *source = get_widget_assert (xml, "weight-cases-treeview");
@@
-118,10
+117,7
@@
weight_cases_dialog (PsppireDataWindow *de)
GtkWidget *selector = get_widget_assert (xml, "weight-cases-selector");
GtkWidget *selector = get_widget_assert (xml, "weight-cases-selector");
- PsppireVarStore *vs = NULL;
-
- g_object_get (de->data_editor, "var-store", &vs, NULL);
- g_object_get (vs, "dictionary", &wcd.dict, NULL);
+ g_object_get (de->data_editor, "dictionary", &wcd.dict, NULL);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
@@
-152,7
+148,7
@@
weight_cases_dialog (PsppireDataWindow *de)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- g_free (execute_syntax_string (generate_syntax (&wcd)));
+ g_free (execute_syntax_string (
de,
generate_syntax (&wcd)));
break;
case PSPPIRE_RESPONSE_PASTE:
g_free (paste_syntax_to_window (generate_syntax (&wcd)));
break;
case PSPPIRE_RESPONSE_PASTE:
g_free (paste_syntax_to_window (generate_syntax (&wcd)));