Renamed time-series directory ts

[pspp-builds.git] / lib / gtksheet / gsheet-hetero-column.c

diff --git a/lib/gtksheet/gsheet-hetero-column.c b/lib/gtksheet/gsheet-hetero-column.c
index a4781e9e9a56d4d59f9ced0c7bcb6b86923c52c1..1285e9f237c16be56d468754273e252c64e5fcbc 100644 (file)
--- a/lib/gtksheet/gsheet-hetero-column.c
+++ b/lib/gtksheet/gsheet-hetero-column.c
@@ -84,6 +84,7 @@ static GtkSheetButton default_button;
 GObject *
 g_sheet_hetero_column_new (gint default_width, gint n_columns)
 {
+  gint i;
   GSheetHeteroColumn *hg;
   GObject *retval;
 
@@ -94,7 +95,6 @@ g_sheet_hetero_column_new (gint default_width, gint n_columns)
   hg->default_width = default_width;
   hg->col = g_new0(struct GSheetHeteroColumnUnit, n_columns);
 
-  gint i;
   for (i = 0 ; i < hg->n_columns; ++i ) 
     {
       hg->col[i].button = default_button;
@@ -116,8 +116,6 @@ g_sheet_hetero_column_get_width(const GSheetColumn *geom, gint i)
 static gint 
 g_sheet_hetero_column_get_sensitivity(const GSheetColumn *geom, gint u)
 {
-  GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-
   return TRUE;
 }
 
@@ -125,27 +123,23 @@ g_sheet_hetero_column_get_sensitivity(const GSheetColumn *geom, gint u)
 static gint 
 g_sheet_hetero_column_get_visibility(const GSheetColumn *geom, gint u)
 {
-  GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-
   return TRUE;
 }
 
 
 
-static const gchar *
+static gchar *
 g_sheet_hetero_column_get_button_label(const GSheetColumn *geom, gint u)
 {
   GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-  
-  return hg->col[u].button.label;
+
+  return g_locale_to_utf8(hg->col[u].button.label, -1, 0, 0, 0);
 }
 
 
 static GtkJustification
 g_sheet_hetero_column_get_justification(const GSheetColumn *geom, gint u)
 {
-  GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-  
   return GTK_JUSTIFY_FILL;
 }