From 235d9e4c4033157c0a4a1ba866664c4b75a33b82 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 9 Jul 2002 06:50:01 +0000 Subject: [PATCH] use a BPen in the BFont class for drawing standard X fonts --- src/Font.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Font.cc b/src/Font.cc index ac315d50..bc4f6440 100644 --- a/src/Font.cc +++ b/src/Font.cc @@ -275,22 +275,16 @@ void BFont::drawString(Drawable d, int x, int y, const BColor &color, } #endif // XFT - BGCCache *_cache = color.display()->gcCache(); - BGCCacheItem *_item = _cache->find(color, _font, GXcopy, ClipByChildren); - - assert(_cache); - assert(_item); + BPen pen(color, _font); if (i18n.multibyte()) - XmbDrawString(_display, d, _fontset, _item->gc(), + XmbDrawString(_display, d, _fontset, pen.gc(), x, y - _fontset_extents->max_ink_extent.y, string.c_str(), string.size()); else - XDrawString(_display, d, _item->gc(), + XDrawString(_display, d, pen.gc(), x, _font->ascent + y, string.c_str(), string.size()); - - _cache->release(_item); } -- 2.39.2