Skip to content

Commit

Permalink
Resolve conflict between VirtualEvent and GenericEvent, at least when…
Browse files Browse the repository at this point in the history
… compiling with Tcl 9.0+ headers


Moved to mistake. This commit broke the test suite. Throws up dialogs like "can't read ::tk_library", "unknown path WINDOW PATH" etc. Causes github actions to time out.
  • Loading branch information
jan.nijtmans committed Apr 19, 2023
2 parents 5406630 + 849fb57 commit 655271c
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions generic/tk.h
Original file line number Diff line number Diff line change
Expand Up @@ -661,11 +661,15 @@ typedef struct Tk_GeomMgr {
*----------------------------------------------------------------------
*/

#define VirtualEvent (MappingNotify + 1)
#define ActivateNotify (MappingNotify + 2)
#define DeactivateNotify (MappingNotify + 3)
#define MouseWheelEvent (MappingNotify + 4)
#define TK_LASTEVENT (MappingNotify + 5)
#if TCL_MAJOR_VERSION > 8
#define VirtualEvent (MappingNotify + 2)
#else
#define VirtualEvent (MappingNotify + 1) /* Conflicts with GenericEvent */
#endif
#define ActivateNotify (VirtualEvent + 1)
#define DeactivateNotify (VirtualEvent + 2)
#define MouseWheelEvent (VirtualEvent + 3)
#define TK_LASTEVENT (VirtualEvent + 4)

#define MouseWheelMask (1L << 28)
#define ActivateMask (1L << 29)
Expand Down

0 comments on commit 655271c

Please sign in to comment.