X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgsheet-hetero-column.c;h=ca43937168d02a962ba59f340949449e3807941b;hb=3e2bf013a731344daed7ab206d4a3c2460688208;hp=ebd67903335fe333fd70260389a4d19d134e65fc;hpb=e294a372f351d7105c21a2db58022af8b119aa64;p=pspp-builds.git

diff --git a/lib/gtksheet/gsheet-hetero-column.c b/lib/gtksheet/gsheet-hetero-column.c
index ebd67903..ca439371 100644
--- a/lib/gtksheet/gsheet-hetero-column.c
+++ b/lib/gtksheet/gsheet-hetero-column.c
@@ -1,7 +1,6 @@
 /* gsheet-hetero-column.c
  * PSPPIRE --- A Graphical User Interface for PSPP
  * Copyright (C) 2006  Free Software Foundation
- * Written by John Darrington
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,6 +16,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#include <config.h>
+
 #include "gsheet-column-iface.h"
 #include "gsheet-hetero-column.h"
 #include <string.h>
@@ -58,7 +59,7 @@ g_sheet_hetero_column_get_type (void)
 	NULL
       };
 
-      hetero_column_type = 
+      hetero_column_type =
 	g_type_register_static (G_TYPE_OBJECT, "g_sheet_hetero_column",
 				&hetero_column_info, 0);
 
@@ -72,7 +73,7 @@ g_sheet_hetero_column_get_type (void)
 
 
 static GtkSheetButton default_button;
-   
+
 
 
 /**
@@ -95,7 +96,7 @@ g_sheet_hetero_column_new (gint default_width, gint n_columns)
   hg->default_width = default_width;
   hg->col = g_new0(struct GSheetHeteroColumnUnit, n_columns);
 
-  for (i = 0 ; i < hg->n_columns; ++i ) 
+  for (i = 0 ; i < hg->n_columns; ++i )
     {
       hg->col[i].button = default_button;
     }
@@ -103,25 +104,25 @@ g_sheet_hetero_column_new (gint default_width, gint n_columns)
   return retval;
 }
 
-static gint 
-g_sheet_hetero_column_get_width(const GSheetColumn *geom, gint i, gpointer data)
+static gint
+g_sheet_hetero_column_get_width(const GSheetColumn *geom, gint i)
 {
   GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
 
   g_return_val_if_fail(i < hg->n_columns, -1);
-  
+
   return hg->col[i].width;
 }
 
-static gint 
-g_sheet_hetero_column_get_sensitivity(const GSheetColumn *geom, gint u, gpointer data)
+static gint
+g_sheet_hetero_column_get_sensitivity(const GSheetColumn *geom, gint u)
 {
   return TRUE;
 }
 
 
-static gint 
-g_sheet_hetero_column_get_visibility(const GSheetColumn *geom, gint u, gpointer data)
+static gint
+g_sheet_hetero_column_get_visibility(const GSheetColumn *geom, gint u)
 {
   return TRUE;
 }
@@ -129,7 +130,7 @@ g_sheet_hetero_column_get_visibility(const GSheetColumn *geom, gint u, gpointer
 
 
 static gchar *
-g_sheet_hetero_column_get_button_label(const GSheetColumn *geom, gint u, gpointer data)
+g_sheet_hetero_column_get_button_label(const GSheetColumn *geom, gint u)
 {
   GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
 
@@ -138,15 +139,15 @@ g_sheet_hetero_column_get_button_label(const GSheetColumn *geom, gint u, gpointe
 
 
 static GtkJustification
-g_sheet_hetero_column_get_justification(const GSheetColumn *geom, gint u, gpointer data)
+g_sheet_hetero_column_get_justification(const GSheetColumn *geom, gint u)
 {
   return GTK_JUSTIFY_FILL;
 }
 
 
 
-static gint 
-g_sheet_hetero_column_get_column_count(const GSheetColumn *geom, gpointer data)
+static gint
+g_sheet_hetero_column_get_column_count(const GSheetColumn *geom)
 {
   GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
 
@@ -176,7 +177,7 @@ g_sheet_hetero_column_init (GSheetHeteroColumn *o)
 {
 }
 
-static void         
+static void
 g_sheet_hetero_column_finalize (GObject           *object)
 {
   GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(object);
@@ -184,9 +185,8 @@ g_sheet_hetero_column_finalize (GObject           *object)
   g_free(hg->col);
 }
 
-static void 
-hetero_column_set_width(GSheetColumn *geo,
-				      gint i, gint size, gpointer data)
+static void
+hetero_column_set_width(GSheetColumn *geo, gint i, gint size)
 {
   GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geo);
 
@@ -211,7 +211,7 @@ g_sheet_column_init (GSheetColumnIface *iface)
 }
 
 
-void 
+void
 g_sheet_hetero_column_set_button_label(GSheetHeteroColumn *geo,
 					      gint i, const gchar *label)
 {
@@ -219,20 +219,19 @@ g_sheet_hetero_column_set_button_label(GSheetHeteroColumn *geo,
 
   g_free(geo->col[i].button.label);
   geo->col[i].button.label = g_malloc(strlen(label) + 1);
-  
+
   g_stpcpy(geo->col[i].button.label, label);
 }
 
 
 
 
-inline void 
-g_sheet_hetero_column_set_width(GSheetHeteroColumn *geo,
-					     gint i, gint size)
+inline void
+g_sheet_hetero_column_set_width(GSheetHeteroColumn *geo, gint i, gint size)
 {
   GSheetColumn *iface = G_SHEET_COLUMN(geo);
 
-  hetero_column_set_width(iface, i, size, 0);
+  hetero_column_set_width(iface, i, size);
 }