projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...
[pspp-builds.git]
/
lib
/
gtksheet
/
gsheetmodel.c
diff --git
a/lib/gtksheet/gsheetmodel.c
b/lib/gtksheet/gsheetmodel.c
index 2497097d150b0a901e43282b8da5c9d177f1e09c..55b22db87010dd41488d15253dd279a13335ebfc 100644
(file)
--- a/
lib/gtksheet/gsheetmodel.c
+++ b/
lib/gtksheet/gsheetmodel.c
@@
-20,7
+20,7
@@
#include <glib.h>
#include "gsheetmodel.h"
#include <glib.h>
#include "gsheetmodel.h"
-#include
"gtkextra-marshal.h"
+#include
<gtksheet/psppire-marshal.h>
enum {
RANGE_CHANGED,
enum {
RANGE_CHANGED,
@@
-80,7
+80,7
@@
g_sheet_model_base_init (gpointer g_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSheetModelIface, range_changed),
NULL, NULL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSheetModelIface, range_changed),
NULL, NULL,
-
gtkextra
_VOID__INT_INT_INT_INT,
+
psppire_marshal
_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_INT,
G_TYPE_NONE, 4,
G_TYPE_INT,
G_TYPE_INT,
@@
-95,7
+95,7
@@
g_sheet_model_base_init (gpointer g_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSheetModelIface, rows_inserted),
NULL, NULL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSheetModelIface, rows_inserted),
NULL, NULL,
-
gtkextra
_VOID__INT_INT,
+
psppire_marshal
_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
@@
-107,7
+107,7
@@
g_sheet_model_base_init (gpointer g_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSheetModelIface, rows_deleted),
NULL, NULL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSheetModelIface, rows_deleted),
NULL, NULL,
-
gtkextra
_VOID__INT_INT,
+
psppire_marshal
_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
@@
-118,7
+118,7
@@
g_sheet_model_base_init (gpointer g_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSheetModelIface, columns_inserted),
NULL, NULL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSheetModelIface, columns_inserted),
NULL, NULL,
-
gtkextra
_VOID__INT_INT,
+
psppire_marshal
_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
@@
-130,7
+130,7
@@
g_sheet_model_base_init (gpointer g_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSheetModelIface, columns_deleted),
NULL, NULL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSheetModelIface, columns_deleted),
NULL, NULL,
-
gtkextra
_VOID__INT_INT,
+
psppire_marshal
_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);