diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | library/demos/unicodeout.tcl | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2007-10-30 Donal K. Fellows <donal.k.fellows@manchester.ac.uk> + + * library/demos/unicodeout.tcl: Fixed Arabic and Hebrew rendering + on Windows. [Bug 1803723] + 2007-10-30 Donal K. Fellows <donal.k.fellows@man.ac.uk> * generic/tkImgPhoto.c (ImgPhotoCmd): Rename enumeration for somewhat diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl index bd9738c..8090b24 100644 --- a/library/demos/unicodeout.tcl +++ b/library/demos/unicodeout.tcl @@ -3,7 +3,7 @@ # This demonstration script shows how you can produce output (in label # widgets) using many different alphabets. # -# RCS: @(#) $Id: unicodeout.tcl,v 1.5 2006/03/22 00:21:17 das Exp $ +# RCS: @(#) $Id: unicodeout.tcl,v 1.6 2007/10/30 15:44:40 dkf Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." @@ -55,7 +55,7 @@ set oldCursor [$w cget -cursor] $w conf -cursor watch update -if {[tk windowingsystem] eq "x11"} { +if {[tk windowingsystem] in {x11 win32}} { # Using presentation forms (pre-layouted) addSample $w Arabic \ "\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D " \ @@ -71,7 +71,7 @@ addSample $w "Simpl. Chinese" "\u6C49\u8BED" addSample $w Greek \ "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \ "\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1" -if {[tk windowingsystem] eq "x11"} { +if {[tk windowingsystem] in {x11 win32}} { # Visual order (pre-layouted) addSample $w Hebrew \ "\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 " \ |