diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | win/tkWinX.c | 8 |
2 files changed, 4 insertions, 7 deletions
@@ -1,8 +1,7 @@ 2010-10-05 Jan Nijtmans <nijtmans@users.sf.net> * generic/tkWinX.c: [Bug 3080953] Malformed Unicode characters in %A substitution - The problem is somewhere in tkWinX.c, so temporary don't compile it with - -DUNICODE, until the real problem is found. + Problem was in the static function GetTranslatedKey(). 2010-10-01 Donal K. Fellows <dkf@users.sf.net> diff --git a/win/tkWinX.c b/win/tkWinX.c index aaaf7c2..00b566c 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -10,11 +10,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinX.c,v 1.71 2010/10/05 13:47:50 nijtmans Exp $ + * RCS: @(#) $Id: tkWinX.c,v 1.72 2010/10/05 14:48:34 nijtmans Exp $ */ -#undef UNICODE -#undef _UNICODE #include "tkWinInt.h" /* @@ -1366,12 +1364,12 @@ GetTranslatedKey( xkey->nbytes = 0; while ((xkey->nbytes < XMaxTransChars) - && PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) { + && PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE)) { if ((msg.message != WM_CHAR) && (msg.message != WM_SYSCHAR)) { break; } - GetMessage(&msg, NULL, 0, 0); + GetMessageA(&msg, NULL, 0, 0); /* * If this is a normal character message, we may need to strip off the |