diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-15 13:08:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-15 13:08:36 (GMT) |
| commit | 003ddcc0f4d523d81ae9e2401549a189fe9fec79 (patch) | |
| tree | c918ee43530387a9961aca8b3eef136a3d3e6396 /generic/tkInt.h | |
| parent | 6c0f9c52947c3a5f4508a694723e355e9a653ce6 (diff) | |
| parent | dc8dcbced6e03edb40b76e2108e6a4ecf6ff37fd (diff) | |
| download | tk-003ddcc0f4d523d81ae9e2401549a189fe9fec79.zip tk-003ddcc0f4d523d81ae9e2401549a189fe9fec79.tar.gz tk-003ddcc0f4d523d81ae9e2401549a189fe9fec79.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 97a0c69..08cf08d 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -893,8 +893,13 @@ typedef struct TkWindow { */ typedef struct { - XKeyEvent keyEvent; /* The real event from X11. */ - char *charValuePtr; /* A pointer to a string that holds the key's + XKeyEvent keyEvent; /* The real event from X11. */ +#ifdef _WIN32 + char trans_chars[XMaxTransChars]; + /* translated characters */ + unsigned char nbytes; +#else + char *charValuePtr; /* A pointer to a string that holds the key's * %A substitution text (before backslash * adding), or NULL if that has not been * computed yet. If non-NULL, this string was @@ -903,6 +908,7 @@ typedef struct { * is non-NULL. */ KeySym keysym; /* Key symbol computed after input methods * have been invoked */ +#endif } TkKeyEvent; /* @@ -1406,7 +1412,6 @@ MODULE_SCOPE unsigned char *TkGetByteArrayFromObj(Tcl_Obj *objPtr, #define TkGetByteArrayFromObj Tcl_GetByteArrayFromObj #endif - /* * Unsupported commands. */ |