X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgsheetmodel.c;h=0d1a3f560a60c8edee89d9e7f8d0ff0553aa660a;hb=f463d854c12bda4f9f12f798ba12d3ea88c3a9ed;hp=22e3af2efee4d9d3535015c00b23893806c9f360;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git

diff --git a/lib/gtksheet/gsheetmodel.c b/lib/gtksheet/gsheetmodel.c
index 22e3af2e..0d1a3f56 100644
--- a/lib/gtksheet/gsheetmodel.c
+++ b/lib/gtksheet/gsheetmodel.c
@@ -37,7 +37,7 @@ static guint sheet_model_signals[LAST_SIGNAL] = { 0 };
 static void      g_sheet_model_base_init   (gpointer           g_class);
 
 
-inline GType
+GType
 g_sheet_model_get_type (void)
 {
   static GType sheet_model_type = 0;
@@ -148,7 +148,7 @@ g_sheet_model_base_init (gpointer g_class)
  * Returns: True if strings obtained with get_string should be freed by the
  * sheet when no longer required.
  **/
-inline  gboolean
+gboolean
 g_sheet_model_free_strings (const GSheetModel *sheet_model)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (sheet_model), FALSE);
@@ -166,9 +166,9 @@ g_sheet_model_free_strings (const GSheetModel *sheet_model)
  * Retrieves the datum at location ROW, COLUMN in the form of a string.
  * Returns: The string representation of the datum, or NULL on error.
  **/
-inline gchar *
+gchar *
 g_sheet_model_get_string (const GSheetModel *sheet_model,
-			  gint row, gint column)
+			  glong row, glong column)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (sheet_model), 0);
 
@@ -190,7 +190,7 @@ g_sheet_model_get_string (const GSheetModel *sheet_model,
 gboolean
 g_sheet_model_set_string      (GSheetModel *sheet_model,
 				 const gchar *text,
-				 gint row, gint column)
+				 glong row, glong column)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (sheet_model), FALSE);
 
@@ -213,7 +213,7 @@ g_sheet_model_set_string      (GSheetModel *sheet_model,
  **/
 gboolean
 g_sheet_model_datum_clear    (GSheetModel *sheet_model,
-				gint row, gint column)
+				glong row, glong column)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (sheet_model), FALSE);
 
@@ -233,8 +233,8 @@ g_sheet_model_datum_clear    (GSheetModel *sheet_model,
  **/
 void
 g_sheet_model_range_changed (GSheetModel *sheet_model,
-			       gint row0, gint col0,
-			       gint rowi, gint coli)
+			       glong row0, glong col0,
+			       glong rowi, glong coli)
 {
   g_return_if_fail (G_IS_SHEET_MODEL (sheet_model));
 
@@ -255,7 +255,7 @@ g_sheet_model_range_changed (GSheetModel *sheet_model,
  **/
 void
 g_sheet_model_rows_inserted (GSheetModel *sheet_model,
-			       gint row, gint n_rows)
+			       glong row, glong n_rows)
 {
   g_return_if_fail (G_IS_SHEET_MODEL (sheet_model));
 
@@ -274,7 +274,7 @@ g_sheet_model_rows_inserted (GSheetModel *sheet_model,
  **/
 void
 g_sheet_model_columns_inserted (GSheetModel *sheet_model,
-			       gint column, gint n_columns)
+			       glong column, glong n_columns)
 {
   g_return_if_fail (G_IS_SHEET_MODEL (sheet_model));
 
@@ -295,7 +295,7 @@ g_sheet_model_columns_inserted (GSheetModel *sheet_model,
  **/
 void
 g_sheet_model_rows_deleted (GSheetModel *sheet_model,
-			       gint row, gint n_rows)
+			       glong row, glong n_rows)
 {
   g_return_if_fail (G_IS_SHEET_MODEL (sheet_model));
 
@@ -315,7 +315,7 @@ g_sheet_model_rows_deleted (GSheetModel *sheet_model,
  **/
 void
 g_sheet_model_columns_deleted (GSheetModel *sheet_model,
-			       gint column, gint n_columns)
+			       glong column, glong n_columns)
 {
   g_return_if_fail (G_IS_SHEET_MODEL (sheet_model));
 
@@ -335,9 +335,9 @@ g_sheet_model_columns_deleted (GSheetModel *sheet_model,
  *
  * Returns: TRUE if the cell is editable, FALSE otherwise
  **/
-inline gboolean
+gboolean
 g_sheet_model_is_editable (const GSheetModel *model,
-			     gint row, gint column)
+			     glong row, glong column)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), TRUE);
 
@@ -356,9 +356,9 @@ g_sheet_model_is_editable (const GSheetModel *model,
  *
  * Returns: TRUE if the cell is visible, FALSE otherwise
  **/
-inline gboolean
+gboolean
 g_sheet_model_is_visible (const GSheetModel *model,
-			  gint row, gint column)
+			  glong row, glong column)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), TRUE);
 
@@ -379,9 +379,9 @@ g_sheet_model_is_visible (const GSheetModel *model,
  * Returns the foreground colour of the cell at @row, @column
  * Returns: the foreground colour, or NULL on error.
  **/
-inline const GdkColor *
+const GdkColor *
 g_sheet_model_get_foreground (const GSheetModel *model,
-				gint row, gint column)
+				glong row, glong column)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), NULL);
 
@@ -401,9 +401,9 @@ g_sheet_model_get_foreground (const GSheetModel *model,
  * Returns the background colour of the cell at @row, @column
  * Returns: the background colour, or NULL on error.
  **/
-inline const GdkColor *
+const GdkColor *
 g_sheet_model_get_background (const GSheetModel *model,
-				gint row, gint column)
+				glong row, glong column)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), NULL);
 
@@ -423,9 +423,9 @@ g_sheet_model_get_background (const GSheetModel *model,
  * Returns the justification of the cell at @row, @column
  * Returns: the justification, or NULL on error.
  **/
-inline const GtkJustification *
+const GtkJustification *
 g_sheet_model_get_justification (const GSheetModel *model,
-				   gint row, gint column)
+				   glong row, glong column)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), NULL);
 
@@ -445,9 +445,9 @@ g_sheet_model_get_justification (const GSheetModel *model,
  * Returns the font description of the cell at @row, @column
  * Returns: the font description, or NULL on error.
  **/
-inline const PangoFontDescription *
+const PangoFontDescription *
 g_sheet_model_get_font_desc(const GSheetModel *model,
-			      gint row, gint column)
+			      glong row, glong column)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), NULL);
   if ( ! G_SHEET_MODEL_GET_IFACE (model)->get_font_desc)
@@ -466,9 +466,9 @@ g_sheet_model_get_font_desc(const GSheetModel *model,
  * Returns the cell border of the cell at @row, @column
  * Returns: the cell border, or NULL on error.
  **/
-inline const GtkSheetCellBorder *
+const GtkSheetCellBorder *
 g_sheet_model_get_cell_border (const GSheetModel *model,
-				 gint row, gint column)
+				 glong row, glong column)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), NULL);
   if ( ! G_SHEET_MODEL_GET_IFACE (model)->get_cell_border)
@@ -486,8 +486,8 @@ g_sheet_model_get_cell_border (const GSheetModel *model,
  *
  * Returns the total number of columns represented by the model
  **/
-inline gint
-g_sheet_model_get_column_count(const GSheetModel *model)
+glong
+g_sheet_model_get_column_count (const GSheetModel *model)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), -1);
 
@@ -500,7 +500,7 @@ g_sheet_model_get_column_count(const GSheetModel *model)
  *
  * Returns the total number of rows represented by the model
  **/
-inline gint
+gint
 g_sheet_model_get_row_count(const GSheetModel *model)
 {
   g_return_val_if_fail (G_IS_SHEET_MODEL (model), -1);