diff options
| author | dgp <dgp@users.sourceforge.net> | 2019-11-22 17:09:18 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2019-11-22 17:09:18 (GMT) |
| commit | 6391ee591b496a5bd7640daa7669c1548f2f03a5 (patch) | |
| tree | 197a84d805e3985f8b44ea3185cebbd943385a9b /library | |
| parent | 8e1942061fef5d51c075e2a8591c78ad1a372799 (diff) | |
| parent | 0d9d82a93075017a8d03b884740a6b342d2a01a2 (diff) | |
| download | tk-6391ee591b496a5bd7640daa7669c1548f2f03a5.zip tk-6391ee591b496a5bd7640daa7669c1548f2f03a5.tar.gz tk-6391ee591b496a5bd7640daa7669c1548f2f03a5.tar.bz2 | |
merge trunk
Diffstat (limited to 'library')
| -rw-r--r-- | library/demos/unicodeout.tcl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl index 9cd3661..25ee932 100644 --- a/library/demos/unicodeout.tcl +++ b/library/demos/unicodeout.tcl @@ -131,8 +131,13 @@ 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" -addSample $w Emoji \ - "\U1F600\U1F4A9\U1F44D\U1F1F3\U1F1F1" +if {[package vsatisfies [package provide Tcl] 8.7-]} { + addSample $w Emoji \ + "\U1F600\U1F4A9\U1F44D\U1F1F3\U1F1F1" +} elseif {([tk windowingsystem] ne "x11") || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))} { + 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 |