From 1e96962f6fe25956ff2c78ae41d735fd3fd394e7 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Wed, 22 Jul 2009 07:59:55 +0000 Subject: Fix stupid svn path=/trunk/netsurf/; revision=8672 --- beos/beos_font.cpp | 7 +++---- beos/beos_plotters.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'beos') diff --git a/beos/beos_font.cpp b/beos/beos_font.cpp index 1d3060cb0..5549c51e6 100644 --- a/beos/beos_font.cpp +++ b/beos/beos_font.cpp @@ -219,13 +219,12 @@ bool nsfont_split(const plot_font_style_t *fstyle, * \param length length of string * \param x x coordinate * \param y y coordinate - * \param c colour for text * \return true on success, false on error and error reported */ bool nsfont_paint(const plot_font_style_t *fstyle, const char *string, size_t length, - int x, int y, colour bg, colour c) + int x, int y) { //fprintf(stderr, "%s(, '%s', %d, %d, %d, )\n", __FUNCTION__, string, length, x, y); //CALLED(); @@ -240,8 +239,8 @@ bool nsfont_paint(const plot_font_style_t *fstyle, return true; nsbeos_style_to_font(font, fstyle); - background = nsbeos_rgb_colour(bg); - foreground = nsbeos_rgb_colour(c); + background = nsbeos_rgb_colour(fstyle->background); + foreground = nsbeos_rgb_colour(fstyle->foreground); view = nsbeos_current_gc/*_lock*/(); if (view == NULL) { diff --git a/beos/beos_plotters.cpp b/beos/beos_plotters.cpp index d7e971528..aff11a088 100644 --- a/beos/beos_plotters.cpp +++ b/beos/beos_plotters.cpp @@ -397,7 +397,7 @@ bool nsbeos_plot_clip(int clip_x0, int clip_y0, bool nsbeos_plot_text(int x, int y, const char *text, size_t length, const plot_font_style_t *fstyle) { - return nsfont_paint(fstyle, text, length, x, y, bg); + return nsfont_paint(fstyle, text, length, x, y); } -- cgit v1.2.3