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/tkWinScrlbr.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/tkWinScrlbr.c')
| -rw-r--r-- | win/tkWinScrlbr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/tkWinScrlbr.c b/win/tkWinScrlbr.c index 363e4bb..40f7186 100644 --- a/win/tkWinScrlbr.c +++ b/win/tkWinScrlbr.c @@ -245,7 +245,7 @@ CreateProc( } scrollPtr->lastVertical = scrollPtr->info.vertical; - scrollPtr->oldProc = (WNDPROC)SetWindowLongPtr(scrollPtr->hwnd, + scrollPtr->oldProc = (WNDPROC)SetWindowLongPtrW(scrollPtr->hwnd, GWLP_WNDPROC, (LONG_PTR) ScrollbarProc); window = Tk_AttachHWND(tkwin, scrollPtr->hwnd); @@ -291,7 +291,7 @@ TkpDisplayScrollbar( if (scrollPtr->lastVertical != scrollPtr->info.vertical) { HWND hwnd = Tk_GetHWND(Tk_WindowId(tkwin)); - SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) scrollPtr->oldProc); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR) scrollPtr->oldProc); DestroyWindow(hwnd); CreateProc(tkwin, Tk_WindowId(Tk_Parent(tkwin)), @@ -325,7 +325,7 @@ TkpDestroyScrollbar( HWND hwnd = winScrollPtr->hwnd; if (hwnd) { - SetWindowLongPtr(hwnd, GWLP_WNDPROC, (INT_PTR) winScrollPtr->oldProc); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (INT_PTR) winScrollPtr->oldProc); if (winScrollPtr->winFlags & IN_MODAL_LOOP) { ((TkWindow *)scrollPtr->tkwin)->flags |= TK_DONT_DESTROY_WINDOW; SetParent(hwnd, NULL); @@ -568,7 +568,7 @@ ScrollbarProc( return result; } } - return CallWindowProc(scrollPtr->oldProc, hwnd, message, wParam, lParam); + return CallWindowProcW(scrollPtr->oldProc, hwnd, message, wParam, lParam); } /* |