Huw Davies : comctl32:
The titles are already converted to unicode so always use DrawTextW to
write them .
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Aug 1 12:45:32 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 64ddc97b09b62547571422bddb37688355e6611c
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64ddc97b09b62547571422bddb37688355e6611c
Author: Huw Davies <huw at codeweavers.com>
Date: Mon Jul 31 12:47:45 2006 +0100
comctl32: The titles are already converted to unicode so always use DrawTextW to write them.
---
dlls/comctl32/propsheet.c | 18 ++----------------
1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 907e638..f6796c6 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -3276,14 +3276,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd
if (ppshpage->dwFlags & PSP_USEHEADERTITLE) {
SetRect(&r, 20, 10, 0, 0);
if (HIWORD(ppshpage->pszHeaderTitle))
- {
- if (psInfo->unicode)
- DrawTextW(hdc, (LPWSTR)ppshpage->pszHeaderTitle,
- -1, &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP);
- else
- DrawTextA(hdc, (LPCSTR)ppshpage->pszHeaderTitle,
- -1, &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP);
- }
+ DrawTextW(hdc, ppshpage->pszHeaderTitle, -1, &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP);
else
{
nLength = LoadStringW(ppshpage->hInstance, (UINT_PTR)ppshpage->pszHeaderTitle,
@@ -3300,14 +3293,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd
SelectObject(hdc, psInfo->hFont);
SetRect(&r, 40, 25, rzone.right - 69, rzone.bottom);
if (HIWORD(ppshpage->pszHeaderTitle))
- {
- if (psInfo->unicode)
- DrawTextW(hdc, (LPWSTR)ppshpage->pszHeaderSubTitle,
- -1, &r, DT_LEFT | DT_SINGLELINE);
- else
- DrawTextA(hdc, (LPCSTR)ppshpage->pszHeaderSubTitle,
- -1, &r, DT_LEFT | DT_SINGLELINE);
- }
+ DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_SINGLELINE);
else
{
nLength = LoadStringW(ppshpage->hInstance, (UINT_PTR)ppshpage->pszHeaderSubTitle,
More information about the wine-cvs
mailing list