diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-27 15:21:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-27 15:21:16 (GMT) |
| commit | 8982d2a60381e8ad4eb9305272f572d939a5d097 (patch) | |
| tree | 5bc0701b49839f4c2039e46686b5432d58c23b2d /generic | |
| parent | f43df857228b616f87644802136c05915d59d48b (diff) | |
| parent | 506ee2fc81bb27e237860565c11a1494ab8c7b38 (diff) | |
| download | tk-8982d2a60381e8ad4eb9305272f572d939a5d097.zip tk-8982d2a60381e8ad4eb9305272f572d939a5d097.tar.gz tk-8982d2a60381e8ad4eb9305272f572d939a5d097.tar.bz2 | |
Merge core-8-6-branch. More surrogate handling, e.g. in HandleIMEComposition()
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkEntry.c | 8 | ||||
| -rw-r--r-- | generic/tkFont.c | 2 | ||||
| -rw-r--r-- | generic/tkFrame.c | 1 | ||||
| -rw-r--r-- | generic/tkWindow.c | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/generic/tkEntry.c b/generic/tkEntry.c index ff3f134..9e25bed 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -3412,7 +3412,7 @@ ExpandPercents( * list element. */ int number, length; register const char *string; - Tcl_UniChar ch; + int ch; char numStorage[2*TCL_INTEGER_SPACE]; while (1) { @@ -3445,7 +3445,7 @@ ExpandPercents( before++; /* skip over % */ if (*before != '\0') { - before += Tcl_UtfToUniChar(before, &ch); + before += TkUtfToUniChar(before, &ch); } else { ch = '%'; } @@ -3465,7 +3465,7 @@ ExpandPercents( string = Tk_PathName(entryPtr->tkwin); break; default: - length = Tcl_UniCharToUtf(ch, numStorage); + length = TkUniCharToUtf(ch, numStorage); numStorage[length] = '\0'; string = numStorage; break; @@ -3525,7 +3525,7 @@ ExpandPercents( string = Tk_PathName(entryPtr->tkwin); break; default: - length = Tcl_UniCharToUtf(ch, numStorage); + length = TkUniCharToUtf(ch, numStorage); numStorage[length] = '\0'; string = numStorage; break; diff --git a/generic/tkFont.c b/generic/tkFont.c index ca7b34e..7f2715b 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -1721,7 +1721,7 @@ Tk_PostscriptFontName( } else { ch = Tcl_UniCharToLower(ch); } - dest += Tcl_UniCharToUtf(ch, dest); + dest += TkUniCharToUtf(ch, dest); } *dest = '\0'; Tcl_DStringSetLength(dsPtr, dest - Tcl_DStringValue(dsPtr)); diff --git a/generic/tkFrame.c b/generic/tkFrame.c index f6edfb0..0f1a1b3 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.c @@ -458,7 +458,6 @@ TkListCreateFrame( * window associated with the interpreter. * Gives the base name to use for the new * application. */ - { int objc; Tcl_Obj **objv; diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 0c60321..5855b7c 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3101,7 +3101,7 @@ Initialize( Tcl_ListObjAppendElement(NULL, cmd, Tcl_NewStringObj("::safe::TkInit", -1)); Tcl_ListObjAppendElement(NULL, cmd, Tcl_GetObjResult(master)); - + /* * Step 2 : Eval in the master. The argument is the *reversed* interp * path of the slave. |