diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-03-16 09:37:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-03-16 09:37:12 (GMT) |
| commit | 2b27bfdd758f6c35adfaf96148424d06f51c9292 (patch) | |
| tree | 7465ca15ecd709c305220786dadca2fa2b2acc90 /generic | |
| parent | d7f29e1ccf269fa5f4cb2cd8d02f35193ebc67be (diff) | |
| download | tk-2b27bfdd758f6c35adfaf96148424d06f51c9292.zip tk-2b27bfdd758f6c35adfaf96148424d06f51c9292.tar.gz tk-2b27bfdd758f6c35adfaf96148424d06f51c9292.tar.bz2 | |
Make Tk compile warning-free against TIP-389-enabled Tcl 8.7. No change of functionality, since font-names generally don't contain out-of-BMP Unicode characters (if they do in the future, that still can be fixed then).
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFont.c | 6 | ||||
| -rw-r--r-- | generic/tkInt.h | 2 |
2 files changed, 4 insertions, 4 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); } diff --git a/generic/tkInt.h b/generic/tkInt.h index b644c5b..600a2a3 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -1196,7 +1196,7 @@ MODULE_SCOPE void TkUnderlineCharsInContext(Display *display, const char *string, int numBytes, int x, int y, int firstByte, int lastByte); MODULE_SCOPE void TkpGetFontAttrsForChar(Tk_Window tkwin, Tk_Font tkfont, - Tcl_UniChar c, struct TkFontAttributes *faPtr); + int c, struct TkFontAttributes *faPtr); MODULE_SCOPE Tcl_Obj * TkNewWindowObj(Tk_Window tkwin); MODULE_SCOPE void TkpShowBusyWindow(TkBusy busy); MODULE_SCOPE void TkpHideBusyWindow(TkBusy busy); |