summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-11-19 10:40:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-11-19 10:40:11 (GMT)
commitb9b549c629dec05a3812bdd812dca3688c1f5ba9 (patch)
treefc9b58aa5c8f744860127fe192366be794bf4373 /library
parent2de29bf91126d0f40530c4a72cf36e95b144e1ce (diff)
parentac36024031479affd0b2b5ada200d04659b61bdc (diff)
downloadtk-b9b549c629dec05a3812bdd812dca3688c1f5ba9.zip
tk-b9b549c629dec05a3812bdd812dca3688c1f5ba9.tar.gz
tk-b9b549c629dec05a3812bdd812dca3688c1f5ba9.tar.bz2
Merge 8.6
Diffstat (limited to 'library')
-rw-r--r--library/demos/unicodeout.tcl5
1 files changed, 4 insertions, 1 deletions
diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl
index 38bba47..bf5dc6d 100644
--- a/library/demos/unicodeout.tcl
+++ b/library/demos/unicodeout.tcl
@@ -131,9 +131,12 @@ addSample $w Japanese \
addSample $w Korean "\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00"
addSample $w Russian \
"\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A"
-if {[tk windowingsystem] ne "x11"} {
+if {[package vsatisfies [package provide Tcl] 8.7-]} {
addSample $w Emoji \
"\U1F600\U1F4A9\U1F44D\U1F1F3\U1F1F1"
+} elseif {[tk windowingsystem] ne "x11"} {
+ addSample $w Emoji \
+ "\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1"
}
## We're done processing, so change things back to normal running...