diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-06-10 21:03:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-06-10 21:03:59 (GMT) |
| commit | bd2618f68e0532440f3e927439e16c62f3a54d09 (patch) | |
| tree | 1633caca9c01f0f5582942d71d7435b014635f83 /win/ttkWinXPTheme.c | |
| parent | 66faab2bdc539d97fbb7a3834e8271555a36759d (diff) | |
| download | tk-bd2618f68e0532440f3e927439e16c62f3a54d09.zip tk-bd2618f68e0532440f3e927439e16c62f3a54d09.tar.gz tk-bd2618f68e0532440f3e927439e16c62f3a54d09.tar.bz2 | |
Eliminate on Windows all usages of Tcl_WinUtfToTChar() and Tcl_WinTCharToUtf(). Proving the point of this TIP.
Diffstat (limited to 'win/ttkWinXPTheme.c')
| -rw-r--r-- | win/ttkWinXPTheme.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index ebe371d..be9d5c8 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -833,7 +833,8 @@ static void TextElementSize( return; src = TkGetStringFromObj(element->textObj, &len); - Tcl_WinUtfToTChar(src, len, &ds); + Tcl_DStringInit(&ds); + Tcl_UtfToUniCharDString(src, len, &ds); hr = elementData->procs->GetThemeTextExtent( elementData->hTheme, elementData->hDC, @@ -872,7 +873,8 @@ static void TextElementDraw( return; src = TkGetStringFromObj(element->textObj, &len); - Tcl_WinUtfToTChar(src, len, &ds); + Tcl_DStringInit(&ds); + Tcl_UtfToUniCharDString(src, len, &ds); hr = elementData->procs->DrawThemeText( elementData->hTheme, elementData->hDC, @@ -1139,7 +1141,8 @@ Ttk_CreateVsapiElement( return TCL_ERROR; } name = TkGetStringFromObj(objv[0], &length); - className = (WCHAR *) Tcl_WinUtfToTChar(name, length, &classBuf); + Tcl_DStringInit(&classBuf); + className = (WCHAR *) Tcl_UtfToUniCharDString(name, length, &classBuf); /* flags or padding */ if (objc > 3) { |