projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace '(GObjectClass*) class' with 'G_OBJECT_CLASS(class)'
[pspp]
/
src
/
ui
/
gui
/
find-dialog.c
diff --git
a/src/ui/gui/find-dialog.c
b/src/ui/gui/find-dialog.c
index e617280739153a28c7445bf7b96568b2ac2c8f65..4dc9b70405cc050b25f66613fbc49b976550745c 100644
(file)
--- a/
src/ui/gui/find-dialog.c
+++ b/
src/ui/gui/find-dialog.c
@@
-101,15
+101,17
@@
refresh (GObject *obj, const struct find_dialog *fd)
static void
do_find (GObject *obj, const struct find_dialog *fd)
{
static void
do_find (GObject *obj, const struct find_dialog *fd)
{
+ SswSheet *sheet = SSW_SHEET (fd->de->data_editor->data_sheet);
casenumber x = -1;
gint column = -1;
casenumber x = -1;
gint column = -1;
- glong row = -1;
+ gint unused;
+ gint row = 0;
+ ssw_sheet_get_active_cell (sheet, &unused, &row);
find_value (fd, row, &x, &column);
if (x != -1)
{
find_value (fd, row, &x, &column);
if (x != -1)
{
- SswSheet *sheet = SSW_SHEET (fd->de->data_editor->data_sheet);
gtk_notebook_set_current_page (GTK_NOTEBOOK (fd->de->data_editor),
PSPPIRE_DATA_EDITOR_DATA_VIEW);
gtk_notebook_set_current_page (GTK_NOTEBOOK (fd->de->data_editor),
PSPPIRE_DATA_EDITOR_DATA_VIEW);
@@
-311,8
+313,8
@@
cp1c (casenumber current, struct datasheet *data)
static casenumber
cm1 (casenumber current, struct datasheet *data)
{
static casenumber
cm1 (casenumber current, struct datasheet *data)
{
- if (current ==
-1
)
- return datasheet_get_n_rows (data);
+ if (current ==
0
)
+ return datasheet_get_n_rows (data)
- 1
;
return current - 1;
}
return current - 1;
}
@@
-323,9
+325,6
@@
cm1c (casenumber current, struct datasheet *data)
{
casenumber next = current;
{
casenumber next = current;
- if (current == -1)
- return datasheet_get_n_rows (data);
-
backward_wrap (&next, data);
return next;
backward_wrap (&next, data);
return next;
@@
-341,9
+340,6
@@
last (casenumber current, struct datasheet *data)
static casenumber
minus1 (casenumber current, struct datasheet *data)
{
static casenumber
minus1 (casenumber current, struct datasheet *data)
{
- if (current == -1)
- return 0;
-
return -1;
}
return -1;
}
@@
-370,9
+366,16
@@
enum iteration_type{
static const struct casenum_iterator ip[n_iterators] =
{
static const struct casenum_iterator ip[n_iterators] =
{
+ /* Forward iterator (linear) */
{cp1, last, forward},
{cp1, last, forward},
+
+ /* Forward iterator (circular) */
{cp1c, cm1, forward_wrap},
{cp1c, cm1, forward_wrap},
+
+ /* Reverse iterator (linear) */
{cm1, minus1, backward},
{cm1, minus1, backward},
+
+ /* Reverse iterator (circular */
{cm1c, cp1, backward_wrap}
};
{cm1c, cp1, backward_wrap}
};