projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved knowledge of pspp_linreg_cache out of pspp_coeff_init
[pspp]
/
lib
/
gtksheet
/
gsheet-hetero-column.c
diff --git
a/lib/gtksheet/gsheet-hetero-column.c
b/lib/gtksheet/gsheet-hetero-column.c
index 575fdc8a3858c6ba080220166fe424052cb10e01..ebd67903335fe333fd70260389a4d19d134e65fc 100644
(file)
--- a/
lib/gtksheet/gsheet-hetero-column.c
+++ b/
lib/gtksheet/gsheet-hetero-column.c
@@
-104,7
+104,7
@@
g_sheet_hetero_column_new (gint default_width, gint n_columns)
}
static gint
}
static gint
-g_sheet_hetero_column_get_width(const GSheetColumn *geom, gint i)
+g_sheet_hetero_column_get_width(const GSheetColumn *geom, gint i
, gpointer data
)
{
GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
{
GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
@@
-114,45
+114,39
@@
g_sheet_hetero_column_get_width(const GSheetColumn *geom, gint i)
}
static gint
}
static gint
-g_sheet_hetero_column_get_sensitivity(const GSheetColumn *geom, gint u)
+g_sheet_hetero_column_get_sensitivity(const GSheetColumn *geom, gint u
, gpointer data
)
{
{
- GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-
return TRUE;
}
static gint
return TRUE;
}
static gint
-g_sheet_hetero_column_get_visibility(const GSheetColumn *geom, gint u)
+g_sheet_hetero_column_get_visibility(const GSheetColumn *geom, gint u
, gpointer data
)
{
{
- GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-
return TRUE;
}
return TRUE;
}
-static
const
gchar *
-g_sheet_hetero_column_get_button_label(const GSheetColumn *geom, gint u)
+static gchar *
+g_sheet_hetero_column_get_button_label(const GSheetColumn *geom, gint u
, gpointer data
)
{
GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
{
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
}
static GtkJustification
-g_sheet_hetero_column_get_justification(const GSheetColumn *geom, gint u)
+g_sheet_hetero_column_get_justification(const GSheetColumn *geom, gint u
, gpointer data
)
{
{
- GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
-
return GTK_JUSTIFY_FILL;
}
static gint
return GTK_JUSTIFY_FILL;
}
static gint
-g_sheet_hetero_column_get_column_count(const GSheetColumn *geom)
+g_sheet_hetero_column_get_column_count(const GSheetColumn *geom
, gpointer data
)
{
GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
{
GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geom);
@@
-190,12
+184,24
@@
g_sheet_hetero_column_finalize (GObject *object)
g_free(hg->col);
}
g_free(hg->col);
}
+static void
+hetero_column_set_width(GSheetColumn *geo,
+ gint i, gint size, gpointer data)
+{
+ GSheetHeteroColumn *hg = G_SHEET_HETERO_COLUMN(geo);
+
+ g_return_if_fail(i < hg->n_columns);
+
+ hg->col[i].width = size;
+}
+
+
static void
g_sheet_column_init (GSheetColumnIface *iface)
{
iface->get_width = g_sheet_hetero_column_get_width ;
static void
g_sheet_column_init (GSheetColumnIface *iface)
{
iface->get_width = g_sheet_hetero_column_get_width ;
- iface->set_width =
g_sheet_
hetero_column_set_width ;
+ iface->set_width = hetero_column_set_width ;
iface->get_sensitivity = g_sheet_hetero_column_get_sensitivity ;
iface->get_visibility = g_sheet_hetero_column_get_visibility ;
iface->get_justification = g_sheet_hetero_column_get_justification;
iface->get_sensitivity = g_sheet_hetero_column_get_sensitivity ;
iface->get_visibility = g_sheet_hetero_column_get_visibility ;
iface->get_justification = g_sheet_hetero_column_get_justification;
@@
-219,13
+225,15
@@
g_sheet_hetero_column_set_button_label(GSheetHeteroColumn *geo,
-void
+
+inline void
g_sheet_hetero_column_set_width(GSheetHeteroColumn *geo,
g_sheet_hetero_column_set_width(GSheetHeteroColumn *geo,
- gint i, gint size)
+
gint i, gint size)
{
{
-
g_return_if_fail(i < geo->n_columns
);
+
GSheetColumn *iface = G_SHEET_COLUMN(geo
);
-
geo->col[i].width = size
;
+
hetero_column_set_width(iface, i, size, 0)
;
}
}
+