From 58973a21a30bf95427fd43c456e41e35c386218c Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 15 Jun 2012 18:52:16 +0000 Subject: another portion of "#ifsef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@434 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/bitmap_funcs.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'plugins/Popup/src/bitmap_funcs.cpp') diff --git a/plugins/Popup/src/bitmap_funcs.cpp b/plugins/Popup/src/bitmap_funcs.cpp index 4cb013a378..22f60786fb 100644 --- a/plugins/Popup/src/bitmap_funcs.cpp +++ b/plugins/Popup/src/bitmap_funcs.cpp @@ -687,22 +687,12 @@ void MyBitmap::Draw_TextA(char *str, int x, int y) void MyBitmap::Draw_TextW(WCHAR *str, int x, int y) { -#if defined(_UNICODE) + SIZE sz; GetTextExtentPoint32W(this->getDC(), str, lstrlenW(str), &sz); RECT rc; SetRect(&rc, x, y, x+10000, y+10000); this->saveAlpha(x,y,sz.cx,sz.cy); DrawTextW(this->getDC(), str, lstrlenW(str), &rc, DT_LEFT | DT_TOP | DT_SINGLELINE | DT_NOPREFIX); this->restoreAlpha(x,y,sz.cx,sz.cy); -#else - if (MyGetTextExtentPoint32W && MyDrawTextW) - { - SIZE sz; MyGetTextExtentPoint32W(this->getDC(), str, lstrlenW(str), &sz); - RECT rc; SetRect(&rc, x, y, x+10000, y+10000); - this->saveAlpha(x,y,sz.cx,sz.cy); - MyDrawTextW(this->getDC(), str, lstrlenW(str), &rc, DT_LEFT | DT_TOP | DT_SINGLELINE | DT_NOPREFIX); - this->restoreAlpha(x,y,sz.cx,sz.cy); - } -#endif } // based on code by Yuriy Zaporozhets from: -- cgit v1.2.3