diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-19 12:05:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-19 12:05:28 (GMT) |
| commit | 435849382625fcaae854915d50512dd1e6f27f2c (patch) | |
| tree | cdabe9c60a5c8e415cbb4f7f05dd9b2b59372edf /unix/tkUnixRFont.c | |
| parent | 71040c30eb391126e584a0acccd1562f9759d375 (diff) | |
| parent | 26807808cc400ad9a0eab231cd691bd5d6722a76 (diff) | |
| download | tk-435849382625fcaae854915d50512dd1e6f27f2c.zip tk-435849382625fcaae854915d50512dd1e6f27f2c.tar.gz tk-435849382625fcaae854915d50512dd1e6f27f2c.tar.bz2 | |
Enhanced proposed fix [6c0d7aec67]: unicode text input Windows 8. More places where Unicode surrogate handling could be improved.
Diffstat (limited to 'unix/tkUnixRFont.c')
| -rw-r--r-- | unix/tkUnixRFont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index 36e5462..edcfc8a 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -615,7 +615,7 @@ void TkpGetFontAttrsForChar( Tk_Window tkwin, /* Window on the font's display */ Tk_Font tkfont, /* Font to query */ - Tcl_UniChar c, /* Character of interest */ + int c, /* Character of interest */ TkFontAttributes *faPtr) /* Output: Font attributes */ { UnixFtFont *fontPtr = (UnixFtFont *) tkfont; @@ -668,9 +668,9 @@ Tk_MeasureChars( curByte = 0; sawNonSpace = 0; while (numBytes > 0) { - Tcl_UniChar unichar; + int unichar; - clen = Tcl_UtfToUniChar(source, &unichar); + clen = TkUtfToUniChar(source, &unichar); c = (FcChar32) unichar; if (clen <= 0) { |