diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-08-29 12:31:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-08-29 12:31:41 (GMT) |
| commit | 8a165192c2d08763b9540f35e9f2cb4f521b5f5f (patch) | |
| tree | cc57fe4b69c24d163afdafa622ef932fa87a475f /generic/tkFont.c | |
| parent | 9900ef4bf9c3880f8d01968600aa70ab2897b8a6 (diff) | |
| parent | d1ffebb971d9a844511bf96c8c734b96c0b75424 (diff) | |
| download | tk-8a165192c2d08763b9540f35e9f2cb4f521b5f5f.zip tk-8a165192c2d08763b9540f35e9f2cb4f521b5f5f.tar.gz tk-8a165192c2d08763b9540f35e9f2cb4f521b5f5f.tar.bz2 | |
rebase to core-8-6-branch.
should now work with TCL_UTF_MAX=4 and TCL_UTF_MAX=6 (not yet with TCL_UTF_MAX=3)
Diffstat (limited to 'generic/tkFont.c')
| -rw-r--r-- | generic/tkFont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 1ffac16..102fc6e 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -497,7 +497,7 @@ Tk_FontObjCmd( const char *s; Tk_Font tkfont; Tcl_Obj *optPtr, *charPtr, *resultPtr; - int uniChar = 0; + Tcl_UniChar uniChar = 0; const TkFontAttributes *faPtr; TkFontAttributes fa; @@ -1714,10 +1714,10 @@ Tk_PostscriptFontName( } src += Tcl_UtfToUniChar(src, &ch); if (upper) { - ch = (Tcl_UniChar) Tcl_UniCharToUpper(ch); + ch = Tcl_UniCharToUpper(ch); upper = 0; } else { - ch = (Tcl_UniChar) Tcl_UniCharToLower(ch); + ch = Tcl_UniCharToLower(ch); } dest += Tcl_UniCharToUtf(ch, dest); } |