projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed unreachable code section
[pspp]
/
src
/
ui
/
gui
/
autorecode-dialog.c
diff --git
a/src/ui/gui/autorecode-dialog.c
b/src/ui/gui/autorecode-dialog.c
index 6780bc7b5d420d250547b755355545471635ed76..7b027d9badae5380e8505a007e188ede868318bd 100644
(file)
--- a/
src/ui/gui/autorecode-dialog.c
+++ b/
src/ui/gui/autorecode-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
@@
-27,6
+27,7
@@
#include "psppire-var-view.h"
#include "executor.h"
#include "psppire-var-view.h"
#include "executor.h"
+#include "builder-wrapper.h"
#include "helper.h"
#include <gtk/gtk.h>
#include "helper.h"
#include <gtk/gtk.h>
@@
-90,7
+91,7
@@
on_change_clicked (GObject *obj, gpointer data)
struct autorecode *rd = data;
struct variable *var = NULL;
struct nlp *nlp;
struct autorecode *rd = data;
struct variable *var = NULL;
struct nlp *nlp;
- GtkTreeModel *model =
GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->var_view)->list
);
+ GtkTreeModel *model =
psppire_var_view_get_current_model (PSPPIRE_VAR_VIEW (rd->var_view)
);
GtkTreeIter iter;
GtkTreeSelection *selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW (rd->var_view));
GtkTreeIter iter;
GtkTreeSelection *selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW (rd->var_view));
@@
-183,7
+184,6
@@
on_entry_change (struct autorecode *rd)
valid = FALSE;
break;
}
valid = FALSE;
break;
}
-
}
}
}
}
@@
-199,7
+199,8
@@
static void
on_selection_change (GtkTreeSelection *selection, gpointer data)
{
struct autorecode *rd = data;
on_selection_change (GtkTreeSelection *selection, gpointer data)
{
struct autorecode *rd = data;
- GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->var_view)->list);
+ GtkTreeModel *model = psppire_var_view_get_current_model (PSPPIRE_VAR_VIEW (rd->var_view));
+
GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
if ( rows && !rows->next)
GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
if ( rows && !rows->next)
@@
-215,6
+216,7
@@
on_selection_change (GtkTreeSelection *selection, gpointer data)
ok = gtk_tree_model_get_iter (model, &iter, (GtkTreePath*) rows->data);
ok = gtk_tree_model_get_iter (model, &iter, (GtkTreePath*) rows->data);
+ g_return_if_fail (ok);
gtk_tree_model_get (model, &iter, 0, &var, -1);
gtk_tree_model_get (model, &iter, 0, &var, -1);
@@
-270,7
+272,6
@@
autorecode_dialog (PsppireDataWindow *de)
gint response;
GtkBuilder *xml = builder_new ("autorecode.ui");
gint response;
GtkBuilder *xml = builder_new ("autorecode.ui");
- PsppireVarStore *vs;
GtkWidget *dialog = get_widget_assert (xml, "autorecode-dialog");
GtkWidget *source = get_widget_assert (xml, "dict-view");
GtkWidget *dialog = get_widget_assert (xml, "autorecode-dialog");
GtkWidget *source = get_widget_assert (xml, "dict-view");
@@
-323,11
+324,10
@@
autorecode_dialog (PsppireDataWindow *de)
}
}
- g_object_get (de->data_editor, "var-store", &vs, NULL);
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", &rd.dict, NULL);
+ g_object_get (
de->data_editor
, "dictionary", &rd.dict, NULL);
g_object_set (source, "model", rd.dict, NULL);
g_object_set (source, "model", rd.dict, NULL);