diff options
| author | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
|---|---|---|
| committer | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
| commit | 613453b1095e325149b8d37e5731d415e1d5f9bd (patch) | |
| tree | 1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/table/e-table-header-utils.c | |
| parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
| download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip | |
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk.
svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/table/e-table-header-utils.c')
| -rw-r--r-- | widgets/table/e-table-header-utils.c | 14 |
1 files changed, 8 insertions, 6 deletions
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 <clahey@ximian.com> - * Miguel de Icaza <miguel@ximian.com> - * Federico Mena-Quintero <federico@ximian.com> + * Miguel de Icaza <miguel@ximian.com> + * Federico Mena-Quintero <federico@ximian.com> * * 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 <string.h> /* strlen() */ #include <glib.h> +#include <gtk/gtkbutton.h> +#include <gtk/gtkwindow.h> #include "e-table-defines.h" #include <gal/widgets/e-unicode.h> @@ -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 */ |