Tk Source Code

I proposed backporting the fix for [9e31fd9449] to Perl/Tk: https://github.com/eserte/perl-tk/pull/89

But Perl/Tk still contains some code which expects ControlMask and None to be defined as macros, so others have proposed this additional change:

--- xlib/X11/X.h.orig
+++ xlib/X11/X.h
@@ -75,6 +75,8 @@ typedef unsigned long KeyCode;	/* In order to use IME, the Macintosh needs
 
 #ifndef _WIN32
 #   define None              0L      /* See bug [9e31fd9449] and below */
+#else
+#   define None              None    /* uses the enum below */
 #endif
 
 #define ParentRelative       1L	/* background pixmap in CreateWindow
@@ -183,6 +185,8 @@ are reserved in the protocol for errors and replies. */
 #define LockMask		(1<<1)
 #ifndef _WIN32
 #   define ControlMask		(1<<2) /* See bug [9e31fd9449] and below */
+#else
+#   define ControlMask          ControlMask /* uses the enum below */
 #endif
 #define Mod1Mask		(1<<3)
 #define Mod2Mask		(1<<4)

Does Tcl/Tk also find this approach preferable?

> Should I add this comment ?

Sure, go ahead! (I only saw your comment after merging it up to Tk 8.7)

Fixed [bc8c792fe4d50902|here], as suggested.

Thanks!

Jan, I think it would be great to have a big comment above the introduced lines by [bc8c792f] why this obvious non-functioning is there.

Maybe something like:

/* Pert-Tk expects None and ControlMask to be a macro see ticket [593eb0227c] */

Should I add this comment ?

Thank you, Harald