mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
PLATFORM_XFT -> PLATFORM_X11
git-svn-id: svn://ultimatepp.org/upp/trunk@1129 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
bc369fae03
commit
fda9e2c88f
2 changed files with 2 additions and 4 deletions
|
|
@ -950,10 +950,8 @@ ViewDraw::ViewDraw(Ctrl *ctrl)
|
|||
clip.Add(r);
|
||||
dw = top->GetWindow();
|
||||
gc = XCreateGC(Xdisplay, dw, 0, 0);
|
||||
#ifdef PLATFORM_XFT
|
||||
xftdraw = XftDrawCreate(Xdisplay, (Drawable) dw,
|
||||
DefaultVisual(Xdisplay, Xscreenno), Xcolormap);
|
||||
#endif
|
||||
Init(clip, r.TopLeft());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -379,7 +379,7 @@ void EscDraw::DrawSmartText(EscEscape& e)
|
|||
if(ii < e.GetCount())
|
||||
font = FontEsc(e[ii++]);
|
||||
if(font.GetHeight() == 0)
|
||||
#ifdef PLATFORM_XFT
|
||||
#ifdef PLATFORM_X11
|
||||
font.Height(12);
|
||||
#else
|
||||
font.Height(11);
|
||||
|
|
@ -412,7 +412,7 @@ void EscDraw::GetTextSize(EscEscape& e)
|
|||
WString text = e[0];
|
||||
Font font = StdFont();
|
||||
if(font.GetHeight() == 0)
|
||||
#ifdef PLATFORM_XFT
|
||||
#ifdef PLATFORM_X11
|
||||
font.Height(12);
|
||||
#else
|
||||
font.Height(11);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue