nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rm consts that wont compile on some libfreetype's

Browse source
This commit is contained in:
Dana Jansens 2003-01-04 01:31:47 +00:00
parent 06eb14fbeb
commit 867d3d9a94
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
otk/font.cc
View file

@ -100,11 +100,11 @@ void BFont::drawString(XftDraw *d, int x, int y, const BColor &color,
if (utf8) if (utf8)
XftDrawStringUtf8(d, &c, _xftfont, x + _offset, XftDrawStringUtf8(d, &c, _xftfont, x + _offset,
_xftfont->ascent + y + _offset, _xftfont->ascent + y + _offset,
(const FcChar8*)string.c_str(), string.size()); (FcChar8*)string.c_str(), string.size());
else else
XftDrawString8(d, &c, _xftfont, x + _offset, XftDrawString8(d, &c, _xftfont, x + _offset,
_xftfont->ascent + y + _offset, _xftfont->ascent + y + _offset,
(const FcChar8*)string.c_str(), string.size()); (FcChar8*)string.c_str(), string.size());
} }
XftColor c; XftColor c;
@ -116,10 +116,10 @@ void BFont::drawString(XftDraw *d, int x, int y, const BColor &color,
if (utf8) if (utf8)
XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y, XftDrawStringUtf8(d, &c, _xftfont, x, _xftfont->ascent + y,
(const FcChar8*)string.c_str(), string.size()); (FcChar8*)string.c_str(), string.size());
else else
XftDrawString8(d, &c, _xftfont, x, _xftfont->ascent + y, XftDrawString8(d, &c, _xftfont, x, _xftfont->ascent + y,
(const FcChar8*)string.c_str(), string.size()); (FcChar8*)string.c_str(), string.size());
return; return;
} }
@ -131,10 +131,10 @@ unsigned int BFont::measureString(const string &string, bool utf8) const
if (utf8) if (utf8)
XftTextExtentsUtf8(OBDisplay::display, _xftfont, XftTextExtentsUtf8(OBDisplay::display, _xftfont,
(const FcChar8*)string.c_str(), string.size(), &info); (FcChar8*)string.c_str(), string.size(), &info);
else else
XftTextExtents8(OBDisplay::display, _xftfont, XftTextExtents8(OBDisplay::display, _xftfont,
(const FcChar8*)string.c_str(), string.size(), &info); (FcChar8*)string.c_str(), string.size(), &info);
return info.xOff + (_shadow ? _offset : 0); return info.xOff + (_shadow ? _offset : 0);
} }