diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-10 14:47:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-10 14:47:53 (GMT) |
| commit | 97a1c864b7a9cb16bacccb971a2785fa74e19494 (patch) | |
| tree | ad766200904cc1e6a92c70189308718f7fe55380 | |
| parent | 6477bb91460d01e185a152d6be44bfd9d1d7362e (diff) | |
| download | tk-97a1c864b7a9cb16bacccb971a2785fa74e19494.zip tk-97a1c864b7a9cb16bacccb971a2785fa74e19494.tar.gz tk-97a1c864b7a9cb16bacccb971a2785fa74e19494.tar.bz2 | |
Make XID typedef unsigned, since it's unsigned as well on all other platforms.
Extend maximum KeySym to allow up to 0x1008FFFF, since there are some MultiMedia keys allocated there.
| -rw-r--r-- | generic/tkBind.c | 3 | ||||
| -rw-r--r-- | xlib/X11/X.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index 4684ce7..f65d2ee 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -5221,7 +5221,8 @@ TkKeysymToString( return Tcl_GetHashValue(hPtr); } #endif /* REDO_KEYSYM_LOOKUP */ - if (keysym > (KeySym)0x10FFFF) { + + if (keysym > (KeySym)0x1008FFFF) { return NULL; } return XKeysymToString(keysym); diff --git a/xlib/X11/X.h b/xlib/X11/X.h index b43967e..c2c57af 100644 --- a/xlib/X11/X.h +++ b/xlib/X11/X.h @@ -41,7 +41,7 @@ SOFTWARE. /* Resources */ #ifdef _WIN64 -typedef __int64 XID; +typedef unsigned __int64 XID; #else typedef unsigned long XID; #endif |