[gnumeric] Use theme foreground color for row and column headers. [#625727]

[Jean Bréfort <jbrefort src gnome org>]

commit e0366072871e19150a4218cdb539f64a3097c2ad
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sun Aug 1 14:50:52 2010 +0200

    Use theme foreground color for row and column headers. [#625727]

 ChangeLog      |    6 ++++++
 NEWS           |    1 +
 src/item-bar.c |    7 +++++--
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 942b17a..3c63079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-01  Jean Brefort  <jean brefort normalesup org>
+
+	reviewed by: <delete if not using a buddy>
+
+	* src/item-bar.c (ib_draw_cell):
+
 2010-07-31  Jean Brefort  <jean brefort normalesup org>
 
 	* src/sheet-object-graph.c (legend_start), (position_end),
diff --git a/NEWS b/NEWS
index c8d39af..773399a 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Andreas:
 Jean:
 	* Import Guppi graphs from gnumeric-1.0.x files. [#567953]
 	* Survive malformed guppi graphs. [#625726]
+	* Use theme foreground color for row and column headers. [#625727]
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.8
diff --git a/src/item-bar.c b/src/item-bar.c
index b2ea1bf..1212f37 100644
--- a/src/item-bar.c
+++ b/src/item-bar.c
@@ -244,7 +244,7 @@ ib_draw_cell (ItemBar const * const ib, cairo_t *cr,
 	GtkWidget   *widget = GTK_WIDGET (canvas);
 	PangoFont	*font;
 	PangoRectangle   size;
-	GOColor color;
+	GOColor color, font_color;
 	int shadow, ascent;
 
 	switch (type) {
@@ -253,6 +253,7 @@ ib_draw_cell (ItemBar const * const ib, cairo_t *cr,
 		shadow = GTK_SHADOW_OUT;
 		font   = ib->normal_font;
 		color = GO_COLOR_FROM_GDK (widget->style->bg[GTK_STATE_ACTIVE]);
+		font_color = GO_COLOR_FROM_GDK (widget->style->fg[GTK_STATE_ACTIVE]);
 		ascent = ib->normal_font_ascent;
 		break;
 
@@ -260,6 +261,7 @@ ib_draw_cell (ItemBar const * const ib, cairo_t *cr,
 		shadow = GTK_SHADOW_OUT;
 		font   = ib->bold_font;
 		color = GO_COLOR_FROM_GDK (widget->style->dark[GTK_STATE_PRELIGHT]);
+		font_color = GO_COLOR_FROM_GDK (widget->style->fg[GTK_STATE_PRELIGHT]);
 		ascent = ib->bold_font_ascent;
 		break;
 
@@ -267,6 +269,7 @@ ib_draw_cell (ItemBar const * const ib, cairo_t *cr,
 		shadow = GTK_SHADOW_IN;
 		font   = ib->bold_font;
 		color = GO_COLOR_FROM_GDK (widget->style->dark[GTK_STATE_NORMAL]);
+		font_color = GO_COLOR_FROM_GDK (widget->style->fg[GTK_STATE_NORMAL]);
 		ascent = ib->bold_font_ascent;
 		break;
 	}
@@ -300,7 +303,7 @@ ib_draw_cell (ItemBar const * const ib, cairo_t *cr,
 
 	cairo_save (cr);
 	cairo_clip (cr);
-	cairo_set_source_rgb (cr, 0., 0., 0.);
+	cairo_set_source_rgba (cr, GO_COLOR_TO_CAIRO (font_color));
 	cairo_translate (cr,
 					 rect->x + (rect->width - PANGO_PIXELS (size.width)) / 2,
 					 rect->y  + (rect->height - PANGO_PIXELS (size.height)) / 2 + ascent);