Fix [8dd3d58c62]: macOS Aqua: Fn + e to access Emoji

5 files changed, 10 insertions, 5 deletions

diff --git a/library/console.tcl b/library/console.tcl
index 07b199e..980b2a1 100644
--- a/library/console.tcl
+++ b/library/console.tcl
@@ -424,7 +424,7 @@ proc ::tk::ConsoleBind {w} {
     # gets and overhaul of how it handles input -- hobbs
     bind Console <Control-t> {}
 
-    # Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
+    # Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound.
     # Otherwise, if a widget binding for one of these is defined, the
     # <Keypress> class binding will also fire and insert the character
     # which is wrong.
@@ -432,6 +432,7 @@ proc ::tk::ConsoleBind {w} {
     bind Console <Alt-Key> {# nothing }
     bind Console <Meta-Key> {# nothing}
     bind Console <Control-Key> {# nothing}
+    bind Console <Mod4-Key> {# nothing}
 
     foreach {ev key} {
 	<<Console_NextImmediate>>	<Control-n>
diff --git a/library/entry.tcl b/library/entry.tcl
index dc9366b..2576317 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -196,7 +196,7 @@ bind Entry <Key> {
     tk::EntryInsert %W %A
 }
 
-# Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
+# Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound.
 # Otherwise, if a widget binding for one of these is defined, the
 # <Key> class binding will also fire and insert the character,
 # which is wrong.  Ditto for Escape, Return, and Tab.
@@ -211,6 +211,7 @@ bind Entry <Tab> {# nothing}
 bind Entry <Prior> {# nothing}
 bind Entry <Next> {# nothing}
 bind Entry <Command-Key> {# nothing}
+bind Entry <Mod4-Key> {# nothing}
 # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
 bind Entry <<NextLine>> {# nothing}
 bind Entry <<PrevLine>> {# nothing}
diff --git a/library/spinbox.tcl b/library/spinbox.tcl
index 3a9e808..8d516bc 100644
--- a/library/spinbox.tcl
+++ b/library/spinbox.tcl
@@ -205,7 +205,7 @@ bind Spinbox <Key> {
     ::tk::EntryInsert %W %A
 }
 
-# Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
+# Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound.
 # Otherwise, if a widget binding for one of these is defined, the
 # <Key> class binding will also fire and insert the character,
 # which is wrong.  Ditto for Escape, Return, and Tab.
@@ -220,6 +220,7 @@ bind Spinbox <Tab> {# nothing}
 bind Spinbox <Prior> {# nothing}
 bind Spinbox <Next> {# nothing}
 bind Spinbox <Command-Key> {# nothing}
+bind Spinbox <Mod4-Key> {# nothing}
 
 # On Windows, paste is done using Shift-Insert.  Shift-Insert already
 # generates the <<Paste>> event, so we don't need to do anything here.
diff --git a/library/text.tcl b/library/text.tcl
index 6392d62..92446a5 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -298,7 +298,7 @@ bind Text <Key> {
     tk::TextInsert %W %A
 }
 
-# Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
+# Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound.
 # Otherwise, if a widget binding for one of these is defined, the
 # <Key> class binding will also fire and insert the character,
 # which is wrong.  Ditto for <Escape>.
@@ -309,6 +309,7 @@ bind Text <Control-Key> {# nothing}
 bind Text <Escape> {# nothing}
 bind Text <KP_Enter> {# nothing}
 bind Text <Command-Key> {# nothing}
+bind Text <Mod4-Key> {# nothing}
 
 # Additional emacs-like bindings:
 
diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl
index f0211c6..cf41315 100644
--- a/library/ttk/entry.tcl
+++ b/library/ttk/entry.tcl
@@ -119,7 +119,7 @@ bind TEntry <Key> 			{ ttk::entry::Insert %W %A }
 bind TEntry <Delete>			{ ttk::entry::Delete %W }
 bind TEntry <BackSpace> 		{ ttk::entry::Backspace %W }
 
-# Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
+# Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound.
 # Otherwise, the <Key> class binding will fire and insert the character.
 # Ditto for Escape, Return, and Tab.
 #
@@ -131,6 +131,7 @@ bind TEntry <Return> 			{# nothing}
 bind TEntry <KP_Enter> 			{# nothing}
 bind TEntry <Tab> 			{# nothing}
 bind TEntry <Command-Key>		{# nothing}
+bind TEntry <Mod4-Key>			{# nothing}
 
 # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
 bind TEntry <<PrevLine>>		{# nothing}