projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change traverse signal to take GtkSheetCell instead of gint,gint
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-data-editor.c
diff --git
a/src/ui/gui/psppire-data-editor.c
b/src/ui/gui/psppire-data-editor.c
index 784a731900309e1a4fea2c8d55476c99bb3d2b59..072e55bad3dc54e2bffe5e50d589563123faa18c 100644
(file)
--- a/
src/ui/gui/psppire-data-editor.c
+++ b/
src/ui/gui/psppire-data-editor.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyrig
g
ht (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008 Free Software Foundation, Inc.
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
@@
-17,7
+17,7
@@
#include <config.h>
#include <gtk/gtksignal.h>
#include <gtk/gtk.h>
#include <config.h>
#include <gtk/gtksignal.h>
#include <gtk/gtk.h>
-#include <gtksheet/gtksheet.h>
+#include <gtksheet/gtk
extra-
sheet.h>
#include "psppire-data-editor.h"
#include "psppire-var-sheet.h"
#include "psppire-data-editor.h"
#include "psppire-var-sheet.h"
@@
-171,14
+171,14
@@
on_var_row_clicked (PsppireDataEditor *de, gint row, gpointer data)
Returns TRUE iff the move should be disallowed */
static gboolean
traverse_cell_callback (GtkSheet *sheet,
Returns TRUE iff the move should be disallowed */
static gboolean
traverse_cell_callback (GtkSheet *sheet,
-
gint row, gint column
,
-
gint *new_row, gint *new_column
,
+
GtkSheetCell *existing_cell
,
+
GtkSheetCell *new_cell
,
gpointer data)
{
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
const PsppireDict *dict = de->data_store->dict;
gpointer data)
{
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
const PsppireDict *dict = de->data_store->dict;
- if (
*new_column
>= psppire_dict_get_var_cnt (dict))
+ if (
new_cell->col
>= psppire_dict_get_var_cnt (dict))
return TRUE;
return FALSE;
return TRUE;
return FALSE;
@@
-624,7
+624,6
@@
init_sheet (PsppireDataEditor *de, int i,
gtk_container_add (GTK_CONTAINER (de->sheet_bin[i]), de->data_sheet[i]);
gtk_container_add (GTK_CONTAINER (de->sheet_bin[i]), de->data_sheet[i]);
-
g_signal_connect (de->data_sheet[i], "traverse",
G_CALLBACK (traverse_cell_callback), de);
g_signal_connect (de->data_sheet[i], "traverse",
G_CALLBACK (traverse_cell_callback), de);