github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-23 22:03:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Minor fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1106 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-04-27 17:48:02 +00:00
parent a840b5fdc8
commit c088dcd9db
10 changed files with 19 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
uppsrc/Draw/DrawText.cpp
View file

@ -294,11 +294,11 @@ void FontInfo::Retain(const FontInfo& f)
charset = f.charset;
}
FontInfo Draw::GetFontInfo(byte charset, Font font) {
FontInfo Draw::GetFontInfoW(Font font) {
DrawLock __;
LTIMING("GetFontInfo");
if(charset == CHARSET_DEFAULT)
charset = GetDefaultCharset();
byte charset = CHARSET_UNICODE;
if(lastFont.IsEqual(charset, font, 0, device))
return lastFont;
#ifdef PLATFORM_WIN32
@ -312,16 +312,6 @@ FontInfo Draw::GetFontInfo(byte charset, Font font) {
return fi;
}
FontInfo Draw::GetFontInfo(Font font)
{
return GetFontInfo(CHARSET_DEFAULT, font);
}
FontInfo Draw::GetFontInfoW(Font font)
{
return GetFontInfo(CHARSET_UNICODE, font);
}
void Draw::SetFont(Font font, int angle) {
DrawLock __;
LLOG("Set font: " << font << " face: " << font.GetFaceName());