summaryrefslogtreecommitdiffstats
path: root/generic/ttk
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-19 10:14:52 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-19 10:14:52 (GMT)
commitbdb580aa2563588e6e1f5090bb9b89369e2f2d4f (patch)
tree011764b9a1c9b1b47f5d61b56f1627526961f832 /generic/ttk
parent7a5d64437977cc14b7b79e336b3b2a20785348e5 (diff)
downloadtk-bdb580aa2563588e6e1f5090bb9b89369e2f2d4f.zip
tk-bdb580aa2563588e6e1f5090bb9b89369e2f2d4f.tar.gz
tk-bdb580aa2563588e6e1f5090bb9b89369e2f2d4f.tar.bz2
More simplifications
Diffstat (limited to 'generic/ttk')
-rw-r--r--generic/ttk/ttkEntry.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index d80e1fd..a25574a 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -282,11 +282,11 @@ static char *EntryDisplayString(const char *showChar, int numChars)
{
char *displayString, *p;
int size;
- Tcl_UniChar ch;
- char buf[4];
+ int ch;
+ char buf[6];
- Tcl_UtfToUniChar(showChar, &ch);
- size = Tcl_UniCharToUtf(ch, buf);
+ TkUtfToUniChar(showChar, &ch);
+ size = TkUniCharToUtf(ch, buf);
p = displayString = ckalloc(numChars * size + 1);
while (numChars--) {
@@ -406,7 +406,7 @@ ExpandPercents(
int number, length;
const char *string;
int stringLength;
- Tcl_UniChar ch;
+ int ch;
char numStorage[2*TCL_INTEGER_SPACE];
while (*template) {
@@ -430,7 +430,7 @@ ExpandPercents(
*/
++template; /* skip over % */
if (*template != '\0') {
- template += Tcl_UtfToUniChar(template, &ch);
+ template += TkUtfToUniChar(template, &ch);
} else {
ch = '%';
}
@@ -480,7 +480,7 @@ ExpandPercents(
string = Tk_PathName(entryPtr->core.tkwin);
break;
default:
- length = Tcl_UniCharToUtf(ch, numStorage);
+ length = TkUniCharToUtf(ch, numStorage);
numStorage[length] = '\0';
string = numStorage;
break;