diff options
| author | fvogel <fvogelnew1@free.fr> | 2017-06-05 18:32:24 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2017-06-05 18:32:24 (GMT) |
| commit | fbac4859a673c9a5f0c8936ed8d18ea9e9145304 (patch) | |
| tree | 4e184d638205d9ce2ef854ebea9393e5d8d91bd3 /win/tkWinTest.c | |
| parent | 452ee6a6849e04a6a94bc7488e935129614041f8 (diff) | |
| parent | fd3fd3d844d9ff5f83c3fd26ee88f2c02892c180 (diff) | |
| download | tk-fbac4859a673c9a5f0c8936ed8d18ea9e9145304.zip tk-fbac4859a673c9a5f0c8936ed8d18ea9e9145304.tar.gz tk-fbac4859a673c9a5f0c8936ed8d18ea9e9145304.tar.bz2 | |
merge trunk
Diffstat (limited to 'win/tkWinTest.c')
| -rw-r--r-- | win/tkWinTest.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/win/tkWinTest.c b/win/tkWinTest.c index 095358d..1c121cc 100644 --- a/win/tkWinTest.c +++ b/win/tkWinTest.c @@ -515,6 +515,7 @@ TestgetwindowinfoObjCmd( Tcl_Obj *childrenObj = NULL; TCHAR buf[512]; int cch, cchBuf = 256; + Tcl_DString ds; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "hwnd"); @@ -542,7 +543,9 @@ TestgetwindowinfoObjCmd( Tcl_NewWideIntObj(GetWindowLongPtr((HWND)(size_t)hwnd, GWL_ID))); cch = GetWindowText((HWND)(size_t)hwnd, (LPTSTR)buf, cchBuf); - textObj = Tcl_NewUnicodeObj((LPCWSTR)buf, cch); + Tcl_WinTCharToUtf(buf, cch * sizeof (WCHAR), &ds); + textObj = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds)); + Tcl_DStringFree(&ds); Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("text", 4), textObj); Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("parent", 6), |