diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-29 19:33:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-29 19:33:55 (GMT) |
| commit | 405efb77f1e112a07406b05b1dfca6b8622cc9c9 (patch) | |
| tree | c8326377193f041b92aa0cb98a6291c79ec88d7e /generic/tkInt.h | |
| parent | 68fc0a0ef4781d53802b28f569935acedc875a92 (diff) | |
| parent | b4c4a98400bc483fdc35555c62cb4de6d2814bdf (diff) | |
| download | tk-405efb77f1e112a07406b05b1dfca6b8622cc9c9.zip tk-405efb77f1e112a07406b05b1dfca6b8622cc9c9.tar.gz tk-405efb77f1e112a07406b05b1dfca6b8622cc9c9.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 9b0616e..dfd1bb3 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. */ + * 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. */ @@ -1057,7 +1064,6 @@ MODULE_SCOPE const char *const tkWebColors[20]; void Tcl_Panic(const char *, ...) __attribute__((analyzer_noreturn)); #endif #if !defined(CLANG_ASSERT) -#include <assert.h> #define CLANG_ASSERT(x) assert(x) #endif #elif !defined(CLANG_ASSERT) |