summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-10-05 14:48:34 (GMT)
committernijtmans <nijtmans>2010-10-05 14:48:34 (GMT)
commit4f9cbe8a775206db62052155ed82bbdcedc9016d (patch)
tree9bf1abfba8093cace5a096e235b0233a860c25b0 /win
parent4f9cfcd7aec217f7becbdb0877addf1819c98062 (diff)
downloadtk-4f9cbe8a775206db62052155ed82bbdcedc9016d.zip
tk-4f9cbe8a775206db62052155ed82bbdcedc9016d.tar.gz
tk-4f9cbe8a775206db62052155ed82bbdcedc9016d.tar.bz2
[Bug 3080953] Malformed Unicode characters in %A substitution
Problem was in the static function GetTranslatedKey().
Diffstat (limited to 'win')
-rw-r--r--win/tkWinX.c8
1 files changed, 3 insertions, 5 deletions
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