summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2019-11-20 18:50:02 (GMT)
committerdgp <dgp@users.sourceforge.net>2019-11-20 18:50:02 (GMT)
commit72ae3baa490baaf69b7359b378361921e532ccde (patch)
tree0ceafbb929cc0ebd5eb08a80288844c8dbad7404 /library
parent83adf45f708233fe1bed74cc67d714c40905dbbd (diff)
parente15390471f6368e52215eb6ff7bd88d3185d66e1 (diff)
downloadtk-72ae3baa490baaf69b7359b378361921e532ccde.zip
tk-72ae3baa490baaf69b7359b378361921e532ccde.tar.gz
tk-72ae3baa490baaf69b7359b378361921e532ccde.tar.bz2
Merge 8.6 except for the broken demo.
Diffstat (limited to 'library')
-rw-r--r--library/demos/unicodeout.tcl4
1 files changed, 4 insertions, 0 deletions
diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl
index faa9f90..811d210 100644
--- a/library/demos/unicodeout.tcl
+++ b/library/demos/unicodeout.tcl
@@ -131,6 +131,10 @@ 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"} {
+ addSample $w Emoji \
+ "\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1"
+}
## We're done processing, so change things back to normal running...
destroy $w.wait