diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-10 12:24:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-10 12:24:16 (GMT) |
| commit | 2201d7a19b192714ac6f19507b8a140ecf59bbfe (patch) | |
| tree | 197bc511c769212f60eb70b52bbe991b2bba74e3 /win/tkWinScrlbr.c | |
| parent | da8764ce8dc25d831e182604c8f148247406cabd (diff) | |
| parent | d6709afd3e1e09c065cf4e39d196eadf839ce4c4 (diff) | |
| download | tk-2201d7a19b192714ac6f19507b8a140ecf59bbfe.zip tk-2201d7a19b192714ac6f19507b8a140ecf59bbfe.tar.gz tk-2201d7a19b192714ac6f19507b8a140ecf59bbfe.tar.bz2 | |
Merge 8.7.
Also remove all traces of HAVE_XKBKEYCODETOKEYSYM (assumed to be 1) and XKEYCODETOKEYSYM_IS_DEPRECATED (not applicable any more)
Diffstat (limited to 'win/tkWinScrlbr.c')
| -rw-r--r-- | win/tkWinScrlbr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/win/tkWinScrlbr.c b/win/tkWinScrlbr.c index 40f7186..9f8c636 100644 --- a/win/tkWinScrlbr.c +++ b/win/tkWinScrlbr.c @@ -82,7 +82,7 @@ const Tk_ClassProcs tkpScrollbarProcs = { static void WinScrollbarEventProc(ClientData clientData, XEvent *eventPtr) { - WinScrollbar *scrollPtr = clientData; + WinScrollbar *scrollPtr = (WinScrollbar *)clientData; if (eventPtr->type == ButtonPress) { ModalLoop(scrollPtr, eventPtr); @@ -121,7 +121,7 @@ TkpCreateScrollbar( Tcl_MutexUnlock(&winScrlbrMutex); } - scrollPtr = ckalloc(sizeof(WinScrollbar)); + scrollPtr = (WinScrollbar *)ckalloc(sizeof(WinScrollbar)); scrollPtr->winFlags = 0; scrollPtr->hwnd = NULL; @@ -275,7 +275,7 @@ void TkpDisplayScrollbar( ClientData clientData) /* Information about window. */ { - WinScrollbar *scrollPtr = clientData; + WinScrollbar *scrollPtr = (WinScrollbar *)clientData; Tk_Window tkwin = scrollPtr->info.tkwin; scrollPtr->info.flags &= ~REDRAW_PENDING; @@ -595,6 +595,7 @@ TkpConfigureScrollbar( /* Information about widget; may or may not * already have values for some fields. */ { + (void)scrollPtr; } /* |