summaryrefslogtreecommitdiffstats
path: root/generic/tkText.c
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2016-09-16 12:17:59 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2016-09-16 12:17:59 (GMT)
commit289a1f9409c3a5c99e36925f03faa4fd06f22400 (patch)
tree7a98c5e25eb278af7eb4c7fa58ab73d819c2c739 /generic/tkText.c
parentbe4f0a11f64f2d73be2116699b905d34a020a830 (diff)
downloadtk-289a1f9409c3a5c99e36925f03faa4fd06f22400.zip
tk-289a1f9409c3a5c99e36925f03faa4fd06f22400.tar.gz
tk-289a1f9409c3a5c99e36925f03faa4fd06f22400.tar.bz2
Rename TkUtfToUniChar32 to TkUtfToUniChar2, and various simplifications needing less #ifdef's
Diffstat (limited to 'generic/tkText.c')
-rw-r--r--generic/tkText.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/generic/tkText.c b/generic/tkText.c
index 834e842..dacadbe 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -4508,11 +4508,7 @@ TkTextGetTabs(
Tcl_Obj **objv;
TkTextTabArray *tabArrayPtr;
TkTextTab *tabPtr;
-#if TCL_UTF_MAX == 4
int ch;
-#else
- Tcl_UniChar ch;
-#endif
double prevStop, lastStop;
/*
* Map these strings to TkTextTabAlign values.
@@ -4619,11 +4615,7 @@ TkTextGetTabs(
* There may be a more efficient way of getting this.
*/
-#if TCL_UTF_MAX == 4
- TkUtfToUniChar32(Tcl_GetString(objv[i+1]), &ch);
-#else
- Tcl_UtfToUniChar(Tcl_GetString(objv[i+1]), &ch);
-#endif
+ TkUtfToUniChar2(Tcl_GetString(objv[i+1]), &ch);
if (!Tcl_UniCharIsAlpha(ch)) {
continue;
}