diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-04 19:59:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-04 19:59:42 (GMT) |
| commit | af4685dea35f639d3f27732345f50c4a0aa67186 (patch) | |
| tree | 401b5d29348f8b7c90893e78bb0ba0607f7f15f4 | |
| parent | c743390877ea708577978d670fb939955a2b7f1a (diff) | |
| parent | b621725f924df41080e34e4f39c7b7876074f1ba (diff) | |
| download | tk-af4685dea35f639d3f27732345f50c4a0aa67186.zip tk-af4685dea35f639d3f27732345f50c4a0aa67186.tar.gz tk-af4685dea35f639d3f27732345f50c4a0aa67186.tar.bz2 | |
Merge 8.7. Also remove unused TkDisplay fields when compiling against Tcl 9.0 headers
| -rw-r--r-- | generic/tkInt.h | 7 | ||||
| -rw-r--r-- | win/tkWinPort.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 17742b0..334464b 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -512,10 +512,17 @@ typedef struct TkDisplay { * The following field were all added for Tk8.3 */ +#if TCL_MAJOR_VERSION < 9 +#if !defined(TK_NO_DEPRECATED) int mouseButtonState; /* Current mouse button state for this * display. NOT USED as of 8.6.10 */ Window mouseButtonWindow; /* Window the button state was set in, added * in Tk 8.4. */ +#else + int notused1; + XID notused2; +#endif /* !TK_NO_DEPRECATED */ +#endif Tk_Window warpWindow; Tk_Window warpMainwin; /* For finding the root window for warping * purposes. */ diff --git a/win/tkWinPort.h b/win/tkWinPort.h index 2473292..89d91a7 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -65,7 +65,6 @@ typedef _TCHAR TCHAR; #endif -#include <unistd.h> #include <X11/Xlib.h> #include <X11/cursorfont.h> #include <X11/keysym.h> |