diff options
| author | nijtmans <nijtmans> | 2010-10-06 14:33:29 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-10-06 14:33:29 (GMT) |
| commit | df03a929f3a0282f0668f932f3a45729b667c9f7 (patch) | |
| tree | 79bdff6580cc1cbf0e6d8a3dc5d5a58fbcb4c0e0 /win/tkWinPixmap.c | |
| parent | 98aad13185edb779119cf4546b08580e0c9cb6ec (diff) | |
| download | tk-df03a929f3a0282f0668f932f3a45729b667c9f7.zip tk-df03a929f3a0282f0668f932f3a45729b667c9f7.tar.gz tk-df03a929f3a0282f0668f932f3a45729b667c9f7.tar.bz2 | |
[FRQ 2965056]: Windows build with -DUNICODE
Diffstat (limited to 'win/tkWinPixmap.c')
| -rw-r--r-- | win/tkWinPixmap.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/win/tkWinPixmap.c b/win/tkWinPixmap.c index a7f6723..60ce7c2 100644 --- a/win/tkWinPixmap.c +++ b/win/tkWinPixmap.c @@ -9,15 +9,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinPixmap.c,v 1.11 2010/09/10 08:59:25 nijtmans Exp $ + * RCS: @(#) $Id: tkWinPixmap.c,v 1.12 2010/10/06 14:33:29 nijtmans Exp $ */ -/* TODO: This file does not compile in UNICODE mode. - * See [Freq 2965056]: Windows build with -DUNICODE - */ -#undef UNICODE -#undef _UNICODE - #include "tkWinInt.h" /* @@ -108,12 +102,12 @@ Tk_GetPixmap( LPVOID lpMsgBuf; repeatError = 1; - if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &lpMsgBuf, 0, NULL)) { - MessageBox(NULL, (LPCTSTR) lpMsgBuf, + (LPSTR) &lpMsgBuf, 0, NULL)) { + MessageBoxA(NULL, (LPCSTR) lpMsgBuf, "Tk_GetPixmap: Error from CreateDIBSection", MB_OK | MB_ICONINFORMATION); LocalFree(lpMsgBuf); |