diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 12:06:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 12:06:43 (GMT) |
| commit | 473ed169135beac6352af2c5f61cca5d404ccf51 (patch) | |
| tree | 92d3c58d4eb81caa992d5c78700b436bed1161dc /win | |
| parent | 0de78ce9ce43fcfbe9fe16cb0cb36f6cfa9b6e07 (diff) | |
| parent | 93a3e63b7e9a22f94f1101b7ba32ac79738e5b65 (diff) | |
| download | tk-473ed169135beac6352af2c5f61cca5d404ccf51.zip tk-473ed169135beac6352af2c5f61cca5d404ccf51.tar.gz tk-473ed169135beac6352af2c5f61cca5d404ccf51.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinWm.c | 4 | ||||
| -rw-r--r-- | win/tkWinX.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index cf354c7..217cc57 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -3709,7 +3709,7 @@ WmFrameCmd( { WmInfo *wmPtr = winPtr->wmInfoPtr; HWND hwnd; - char buf[TCL_INTEGER_SPACE]; + char buf[TCL_INTEGER_SPACE]; if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "window"); @@ -3722,7 +3722,7 @@ WmFrameCmd( if (hwnd == NULL) { hwnd = Tk_GetHWND(Tk_WindowId((Tk_Window) winPtr)); } - sprintf(buf, "0x%" TCL_Z_MODIFIER "x", (size_t)PTR2INT(hwnd)); + sprintf(buf, "0x%" TCL_Z_MODIFIER "x", (size_t)hwnd); Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, -1)); return TCL_OK; } diff --git a/win/tkWinX.c b/win/tkWinX.c index 33e34da..96a6958 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -1495,7 +1495,7 @@ UpdateInputLanguage( return; } - wsprintfA(codepage, "cp%d", charsetInfo.ciACP); + sprintf(codepage, "cp%d", charsetInfo.ciACP); if ((encoding = Tcl_GetEncoding(NULL, codepage)) == NULL) { /* |