From 613453b1095e325149b8d37e5731d415e1d5f9bd Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 31 Oct 2002 21:30:57 +0000 Subject: merging the gal-2 branch back to the trunk. merging the gal-2 branch back to the trunk. svn path=/trunk/; revision=18471 --- widgets/table/e-table-header-utils.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'widgets/table/e-table-header-utils.c') diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index 9668250961..60cc9f9e32 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -5,8 +5,8 @@ * * Authors: * Chris Lahey - * Miguel de Icaza - * Federico Mena-Quintero + * Miguel de Icaza + * Federico Mena-Quintero * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -31,6 +31,8 @@ #include /* strlen() */ #include +#include +#include #include "e-table-defines.h" #include @@ -56,7 +58,7 @@ e_table_header_compute_height (ETableCol *ecol, GtkStyle *style, GdkFont *font) g_return_val_if_fail (E_IS_TABLE_COL (ecol), -1); g_return_val_if_fail (style != NULL, -1); - ythick = style->klass->ythickness; + ythick = style->ythickness; if (font) height = font->ascent + font->descent; @@ -80,7 +82,7 @@ e_table_header_width_extras (GtkStyle *style) { g_return_val_if_fail (style != NULL, -1); - return 2 * (style->klass->xthickness + HEADER_PADDING); + return 2 * (style->xthickness + HEADER_PADDING); } /* Creates a pixmap that is a composite of a background color and the upper-left @@ -250,8 +252,8 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol, gc = g_label->style->fg_gc[GTK_STATE_NORMAL]; - xthick = style->klass->xthickness; - ythick = style->klass->ythickness; + xthick = style->xthickness; + ythick = style->ythickness; /* Button bevel */ -- cgit