diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-23 19:10:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-23 19:10:41 (GMT) |
| commit | d598dd109c654e821ea36ae227a5d981076539e4 (patch) | |
| tree | 102b4591d67f7a5d907be97efb83050fffb43b33 /win/tkWinTest.c | |
| parent | 473cbe0b52be91536966ff3eb575c2b2a36b7e7b (diff) | |
| parent | 797299a238c72e1add2fd56d9706346a46861e0a (diff) | |
| download | tk-d598dd109c654e821ea36ae227a5d981076539e4.zip tk-d598dd109c654e821ea36ae227a5d981076539e4.tar.gz tk-d598dd109c654e821ea36ae227a5d981076539e4.tar.bz2 | |
Merge 8.6.
Don't use TCL_Z_MODIFIER on Windows, because it only works when Tk 8.7 is compiled with Tcl 8.7, not with Tcl 8.6
Diffstat (limited to 'win/tkWinTest.c')
| -rw-r--r-- | win/tkWinTest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/tkWinTest.c b/win/tkWinTest.c index c82bf86..c86a770 100644 --- a/win/tkWinTest.c +++ b/win/tkWinTest.c @@ -444,7 +444,7 @@ TestfindwindowObjCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument values. */ { - const WCHAR *title = NULL, *class = NULL; + LPCWSTR title = NULL, class = NULL; Tcl_DString titleString, classString; HWND hwnd = NULL; int r = TCL_OK; @@ -548,7 +548,7 @@ TestgetwindowinfoObjCmd( Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("id", 2), Tcl_NewWideIntObj(GetWindowLongPtr((HWND)(size_t)hwnd, GWL_ID))); - cch = GetWindowTextW(INT2PTR(hwnd), (LPWSTR)buf, cchBuf); + cch = GetWindowTextW(INT2PTR(hwnd), buf, cchBuf); Tcl_DStringInit(&ds); Tcl_WCharToUtfDString(buf, cch, &ds); textObj = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds)); |