summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-07-09 06:50:01 +0000
committerDana Jansens <danakj@orodu.net>2002-07-09 06:50:01 +0000
commit235d9e4c4033157c0a4a1ba866664c4b75a33b82 (patch)
tree2035f2697dea9356d62c973cddc5e8cda9353a18 /src
parent0c04fb5260a535d8457febca9bf05669a85b1c12 (diff)
use a BPen in the BFont class for drawing standard X fonts
Diffstat (limited to 'src')
-rw-r--r--src/Font.cc12
1 files 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);
}