projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update remaining gtk_paint_focus calls to Gtk3 signature
[pspp]
/
src
/
ui
/
gui
/
split-file-dialog.c
diff --git
a/src/ui/gui/split-file-dialog.c
b/src/ui/gui/split-file-dialog.c
index 9aacdffd4c80e578f4d578b9c390ee1e1bf197d7..2cf10d532945d837965b4861a837ec3a86e5f39d 100644
(file)
--- a/
src/ui/gui/split-file-dialog.c
+++ b/
src/ui/gui/split-file-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,7
+22,9
@@
#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 "helper.h"
+
#include <data/dictionary.h>
#include "psppire-var-view.h"
#include <data/dictionary.h>
#include "psppire-var-view.h"
@@
-32,9
+34,6
@@
#include "dialog-common.h"
#include "dialog-common.h"
-/* FIXME: These shouldn't be here */
-#include "psppire-var-store.h"
-
struct split_file_dialog
{
struct split_file_dialog
{
@@
-163,7
+162,6
@@
split_file_dialog (PsppireDataWindow *de)
{
gint response;
struct split_file_dialog sfd;
{
gint response;
struct split_file_dialog sfd;
- PsppireVarStore *vs ;
GtkWidget *dialog ;
GtkWidget *source ;
GtkWidget *dialog ;
GtkWidget *source ;
@@
-179,11
+177,9
@@
split_file_dialog (PsppireDataWindow *de)
sfd.tv = GTK_TREE_VIEW (get_widget_assert (sfd.xml, "split-file-grouping-vars"));
sfd.tv = GTK_TREE_VIEW (get_widget_assert (sfd.xml, "split-file-grouping-vars"));
- g_object_get (de->data_editor, "var-store", &vs, NULL);
-
- g_object_get (vs, "dictionary", &sfd.dict, NULL);
+ g_object_get (de->data_editor, "dictionary", &sfd.dict, NULL);
- sfd.selector = PSPPIRE_SELECTOR (
get_widget_assert (sfd.xml, "split-file-selector")
);
+ sfd.selector = PSPPIRE_SELECTOR (
selector
);
g_object_set (source, "model", sfd.dict, NULL);
g_object_set (source, "model", sfd.dict, NULL);
@@
-199,7
+195,7
@@
split_file_dialog (PsppireDataWindow *de)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- g_free (execute_syntax_string (generate_syntax (&sfd)));
+ g_free (execute_syntax_string (
de,
generate_syntax (&sfd)));
break;
case PSPPIRE_RESPONSE_PASTE:
g_free (paste_syntax_to_window (generate_syntax (&sfd)));
break;
case PSPPIRE_RESPONSE_PASTE:
g_free (paste_syntax_to_window (generate_syntax (&sfd)));