From 585f863c24ab212d559e7d7df5b30b29faec8d1f Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 21 Jun 2007 22:58:50 +0200 Subject: [PATCH] comctl32: Do not use wide character constants. --- dlls/comctl32/commctrl.c | 4 ++-- dlls/comctl32/string.c | 4 ++-- dlls/comctl32/tooltips.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 1e74afd9042..5d75d794e0e 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -442,10 +442,10 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) if (text) { int oldbkmode = SetBkMode (hdc, TRANSPARENT); UINT align = DT_LEFT; - if (*text == L'\t') { + if (*text == '\t') { text++; align = DT_CENTER; - if (*text == L'\t') { + if (*text == '\t') { text++; align = DT_RIGHT; } diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 00f72adac13..654c4676994 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -240,7 +240,7 @@ INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) return 0; if (lpSrc == NULL) { - lpDest[0] = L'\0'; + lpDest[0] = '\0'; return 0; } @@ -249,7 +249,7 @@ INT WINAPI Str_GetPtrW (LPCWSTR lpSrc, LPWSTR lpDest, INT nMaxLen) len = nMaxLen - 1; RtlMoveMemory (lpDest, lpSrc, len*sizeof(WCHAR)); - lpDest[len] = L'\0'; + lpDest[len] = '\0'; return len; } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 032ef251d4b..4e11c5cd525 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -427,7 +427,7 @@ TOOLTIPS_GetTipText (HWND hwnd, TOOLTIPS_INFO *infoPtr, INT nTool) } else { /* no text available */ - infoPtr->szTipText[0] = L'\0'; + infoPtr->szTipText[0] = '\0'; } TRACE("%s\n", debugstr_w(infoPtr->szTipText)); @@ -515,7 +515,7 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr) TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nCurrentTool); - if (infoPtr->szTipText[0] == L'\0') { + if (infoPtr->szTipText[0] == '\0') { infoPtr->nCurrentTool = -1; return; } @@ -734,7 +734,7 @@ TOOLTIPS_TrackShow (HWND hwnd, TOOLTIPS_INFO *infoPtr) TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nTrackTool); - if (infoPtr->szTipText[0] == L'\0') { + if (infoPtr->szTipText[0] == '\0') { infoPtr->nTrackTool = -1; return; } -- 2.11.4.GIT