diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-18 20:02:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-18 20:02:27 (GMT) |
| commit | 8b85b7738f72abf3175af6cbca0474b78882f395 (patch) | |
| tree | eee6e718606a4c40e2283ab164a77fedf79c3ab6 /library | |
| parent | 6e5b062650d937a3a1c7af3bf112fe61d54d6a78 (diff) | |
| parent | f3e045cc474203fdfb1a77892eadfba33275509c (diff) | |
| download | tk-8b85b7738f72abf3175af6cbca0474b78882f395.zip tk-8b85b7738f72abf3175af6cbca0474b78882f395.tar.gz tk-8b85b7738f72abf3175af6cbca0474b78882f395.tar.bz2 | |
Merge 8.6, but only exclude Emoji's in the demo for X11.
Diffstat (limited to 'library')
| -rw-r--r-- | library/demos/unicodeout.tcl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl index a8b5bbb..811d210 100644 --- a/library/demos/unicodeout.tcl +++ b/library/demos/unicodeout.tcl @@ -131,8 +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" -addSample $w Emoji \ - "\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1" +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 |