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 0839f221e04c8214434e50711fc535cd5efe34fb..55b22db87010dd41488d15253dd279a13335ebfc 100644 (file)
--- a/lib/gtksheet/gsheetmodel.c
+++ b/lib/gtksheet/gsheetmodel.c
@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include "gsheetmodel.h"
-#include "gtkextra-marshal.h"
+#include <gtksheet/psppire-marshal.h>
 
 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,
-                     gtkextra_VOID__INT_INT_INT_INT,
+                     psppire_marshal_VOID__INT_INT_INT_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,
-                     gtkextra_VOID__INT_INT,
+                     psppire_marshal_VOID__INT_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,
-                     gtkextra_VOID__INT_INT,
+                     psppire_marshal_VOID__INT_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,
-                     gtkextra_VOID__INT_INT,
+                     psppire_marshal_VOID__INT_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,
-                     gtkextra_VOID__INT_INT,
+                     psppire_marshal_VOID__INT_INT,
                      G_TYPE_NONE, 2,
                      G_TYPE_INT,
                      G_TYPE_INT);
@@ -505,7 +505,6 @@ g_sheet_model_get_row_count(const GSheetModel *model)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), -1);
 
-
   return G_SHEET_MODEL_GET_IFACE (model)->get_row_count (model);
 }
 
@@ -515,6 +514,8 @@ g_sheet_model_get_row_count(const GSheetModel *model)
 gboolean
 g_sheet_model_get_column_sensitivity (const GSheetModel *model, gint col)
 {
+  g_return_val_if_fail (G_IS_SHEET_MODEL (model), FALSE);
+
   if ( NULL == G_SHEET_MODEL_GET_IFACE (model)->get_column_sensitivity)
     return TRUE;
 
@@ -553,6 +554,8 @@ GtkJustification
 g_sheet_model_get_column_justification (const GSheetModel *model,
                                        gint col)
 {
+  g_return_val_if_fail (G_IS_SHEET_MODEL (model), GTK_JUSTIFY_LEFT);
+
   if ( G_SHEET_MODEL_GET_IFACE (model)->get_column_justification)
     return G_SHEET_MODEL_GET_IFACE (model)->get_column_justification (model, col);
 
@@ -564,6 +567,8 @@ g_sheet_model_get_column_justification (const GSheetModel *model,
 gboolean
 g_sheet_model_get_row_sensitivity (const GSheetModel *model, gint row)
 {
+  g_return_val_if_fail (G_IS_SHEET_MODEL (model), FALSE);
+
   if ( NULL == G_SHEET_MODEL_GET_IFACE (model)->get_row_sensitivity)
     return TRUE;