diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-11-30 21:21:48 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-11-30 21:21:48 (GMT) |
| commit | a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a (patch) | |
| tree | 24ccb2318d04412685b1a4262df7c33df0864d34 /win/tkWinEmbed.c | |
| parent | ddb9e825e0b85f216d172f8b537257c8d58b0de9 (diff) | |
| parent | b8bfd3505b511a3cc94297df7f04c55505d6df2c (diff) | |
| download | tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.zip tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.tar.gz tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.tar.bz2 | |
merge 8.5
Diffstat (limited to 'win/tkWinEmbed.c')
| -rw-r--r-- | win/tkWinEmbed.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c index b7f5085..a0670cc 100644 --- a/win/tkWinEmbed.c +++ b/win/tkWinEmbed.c @@ -256,10 +256,13 @@ TkpUseWindow( return TCL_OK; } - if (Tcl_GetInt(interp, string, &id) != TCL_OK) { + if ( +#ifdef _WIN64 + (sscanf(string, "0x%p", &hwnd) != 1) && +#endif + Tcl_GetInt(interp, string, (int *) &hwnd) != TCL_OK) { return TCL_ERROR; } - hwnd = (HWND) INT2PTR(id); if ((HWND)winPtr->privatePtr == hwnd) { return TCL_OK; } |