summaryrefslogtreecommitdiffstats
path: root/generic/tkFont.c
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2016-08-29 15:28:20 (GMT)
committerfvogel <fvogelnew1@free.fr>2016-08-29 15:28:20 (GMT)
commit992eb3df2d03dec6291784e8dca7e6d85b279c7a (patch)
treec885db53fd7bd38e3971e2b93242b2e798961ee9 /generic/tkFont.c
parent1052e56fe96f3ece407a6374714af0302c9a5e3c (diff)
parent76052445ac39afd2c455431d80335dd464ed755e (diff)
downloadtk-tip_449.zip
tk-tip_449.tar.gz
tk-tip_449.tar.bz2
Rebased to trunk since TIP #449 was accepted for merging to trunk only, not to core-8-6-branchtip_449
Diffstat (limited to 'generic/tkFont.c')
-rw-r--r--generic/tkFont.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 102fc6e..1ffac16 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;
- Tcl_UniChar uniChar = 0;
+ int uniChar = 0;
const TkFontAttributes *faPtr;
TkFontAttributes fa;
@@ -1714,10 +1714,10 @@ Tk_PostscriptFontName(
}
src += Tcl_UtfToUniChar(src, &ch);
if (upper) {
- ch = Tcl_UniCharToUpper(ch);
+ ch = (Tcl_UniChar) Tcl_UniCharToUpper(ch);
upper = 0;
} else {
- ch = Tcl_UniCharToLower(ch);
+ ch = (Tcl_UniChar) Tcl_UniCharToLower(ch);
}
dest += Tcl_UniCharToUtf(ch, dest);
}