diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-06-11 11:39:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-06-11 11:39:44 (GMT) |
| commit | 168bc3c1f9f4f57f0eb8be8bfa2db0fae62d55d6 (patch) | |
| tree | 8146fd7de9ba4a92a5744842bf48b8e61135dfd0 /win/tkWinWm.c | |
| parent | bd2618f68e0532440f3e927439e16c62f3a54d09 (diff) | |
| download | tk-168bc3c1f9f4f57f0eb8be8bfa2db0fae62d55d6.zip tk-168bc3c1f9f4f57f0eb8be8bfa2db0fae62d55d6.tar.gz tk-168bc3c1f9f4f57f0eb8be8bfa2db0fae62d55d6.tar.bz2 | |
More TCHAR -> WCHAR conversions
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 6aecfa8..1337cbc 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -883,7 +883,7 @@ InitWindowClass( class.lpszClassName = TK_WIN_TOPLEVEL_CLASS_NAME; class.lpfnWndProc = WmProc; if (titlebaricon == NULL) { - class.hIcon = LoadIcon(Tk_GetHINSTANCE(), TEXT("tk")); + class.hIcon = LoadIcon(Tk_GetHINSTANCE(), L"tk"); } else { class.hIcon = GetIcon(titlebaricon, ICON_BIG); if (class.hIcon == NULL) { @@ -1249,7 +1249,7 @@ ReadIconFromFile( Tcl_DStringInit(&ds2); Tcl_UtfToUniCharDString(file, -1, &ds2); Tcl_DStringFree(&ds); - res = (DWORD *)SHGetFileInfo((TCHAR *)Tcl_DStringValue(&ds2), 0, &sfiSM, + res = (DWORD *)SHGetFileInfo((WCHAR *)Tcl_DStringValue(&ds2), 0, &sfiSM, sizeof(SHFILEINFO), SHGFI_SMALLICON|SHGFI_ICON); if (res != 0) { @@ -1257,7 +1257,7 @@ ReadIconFromFile( unsigned size; Tcl_ResetResult(interp); - res = (DWORD *)SHGetFileInfo((TCHAR *)Tcl_DStringValue(&ds2), 0, &sfi, + res = (DWORD *)SHGetFileInfo((WCHAR *)Tcl_DStringValue(&ds2), 0, &sfi, sizeof(SHFILEINFO), SHGFI_ICON); /* @@ -2133,7 +2133,7 @@ UpdateWrapper( wmPtr->wrapper = CreateWindowEx(wmPtr->exStyle, TK_WIN_TOPLEVEL_CLASS_NAME, - (LPCTSTR) Tcl_DStringValue(&titleString), + (LPCWSTR) Tcl_DStringValue(&titleString), wmPtr->style, x, y, width, height, parentHWND, NULL, Tk_GetHINSTANCE(), NULL); Tcl_DStringFree(&titleString); @@ -5468,7 +5468,7 @@ WmTitleCmd( } if (objc == 3) { if (wrapper) { - TCHAR buf[256]; + WCHAR buf[256]; Tcl_DString titleString; int size = 256; @@ -5497,7 +5497,7 @@ WmTitleCmd( Tcl_DStringInit(&titleString); Tcl_UtfToUniCharDString(wmPtr->title, -1, &titleString); - SetWindowText(wrapper, (LPCTSTR) Tcl_DStringValue(&titleString)); + SetWindowText(wrapper, (LPCWSTR) Tcl_DStringValue(&titleString)); Tcl_DStringFree(&titleString); } } |