diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-16 07:59:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-16 07:59:23 (GMT) |
| commit | 487b808fa7ad1096e9ee4112a719c8ed3cd45ff8 (patch) | |
| tree | 91ab786798803ba6ceb2719029759f2c87ccfd5f /win/tkWinX.c | |
| parent | b759c79faef78af4298e356f590b3d3a35b5ae01 (diff) | |
| download | tk-487b808fa7ad1096e9ee4112a719c8ed3cd45ff8.zip tk-487b808fa7ad1096e9ee4112a719c8ed3cd45ff8.tar.gz tk-487b808fa7ad1096e9ee4112a719c8ed3cd45ff8.tar.bz2 | |
TCHAR -> WCHAR conversions, since our TCHAR is actually WCHAR when compiling everything in UNICODE mode on Windows.
Diffstat (limited to 'win/tkWinX.c')
| -rw-r--r-- | win/tkWinX.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/tkWinX.c b/win/tkWinX.c index 7aa49ab..2ea5a95 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -138,7 +138,7 @@ TkGetServerInfo( OSVERSIONINFOW os; if (!buffer[0]) { - HANDLE handle = GetModuleHandle(TEXT("NTDLL")); + HANDLE handle = GetModuleHandle(L"NTDLL"); int(__stdcall *getversion)(void *) = (int(__stdcall *)(void *))GetProcAddress(handle, "RtlGetVersion"); os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); @@ -269,7 +269,7 @@ TkWinXInit( if (GetLocaleInfo(LANGIDFROMLCID(PTR2INT(GetKeyboardLayout(0))), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, - (LPTSTR) &lpCP, sizeof(lpCP)/sizeof(TCHAR)) + (LPWSTR) &lpCP, sizeof(lpCP)/sizeof(WCHAR)) && TranslateCharsetInfo(INT2PTR(lpCP), &lpCs, TCI_SRCCODEPAGE)) { UpdateInputLanguage((int) lpCs.ciCharset); } @@ -365,8 +365,8 @@ TkWinGetPlatformId(void) if ((os.dwPlatformId == VER_PLATFORM_WIN32_NT) && (os.dwMajorVersion == 5 && os.dwMinorVersion == 1)) { HKEY hKey; - LPCTSTR szSubKey = TEXT("Control Panel\\Appearance"); - LPCTSTR szCurrent = TEXT("Current"); + LPCWSTR szSubKey = L"Control Panel\\Appearance"; + LPCWSTR szCurrent = L"Current"; DWORD dwSize = 200; char pBuffer[200]; |