diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-11-10 16:31:37 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-11-10 16:31:37 +0300 |
| commit | 6b11c1df57c7e293df98fb4af0f8a7ed05cb850a (patch) | |
| tree | cedc7aa3bc96a1e4e3f551860b18a55763d42187 /src | |
| parent | 9446fe458391fccdc34c1a962254847b661bd04d (diff) | |
fixes #3906 (UInfoEx: не переводятся интересы в профиле контакта)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/button.cpp | 2 | ||||
| -rw-r--r-- | src/mir_core/src/Windows/langpack.cpp | 12 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core.def | 1 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core64.def | 1 |
4 files changed, 1 insertions, 15 deletions
diff --git a/src/mir_app/src/button.cpp b/src/mir_app/src/button.cpp index b97685716e..14bb5bb04f 100644 --- a/src/mir_app/src/button.cpp +++ b/src/mir_app/src/button.cpp @@ -467,7 +467,7 @@ static LRESULT CALLBACK MButtonWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (lParam & BATF_UNICODE)
ti.lpszText = mir_wstrdup(TranslateW((wchar_t*)wParam));
else
- ti.lpszText = Langpack_PcharToTchar((char*)wParam);
+ ti.lpszText = mir_wstrdup(TranslateW(_A2T((char*)wParam)));
SendMessage(bct->hwndToolTips, TTM_ADDTOOL, 0, (LPARAM)&ti);
SendMessage(bct->hwndToolTips, TTM_SETMAXTIPWIDTH, 0, 300);
mir_free(ti.lpszText);
diff --git a/src/mir_core/src/Windows/langpack.cpp b/src/mir_core/src/Windows/langpack.cpp index 9a9a96fde8..412020ac44 100644 --- a/src/mir_core/src/Windows/langpack.cpp +++ b/src/mir_core/src/Windows/langpack.cpp @@ -520,18 +520,6 @@ MIR_CORE_DLL(int) Langpack_GetDefaultLocale() return (langPack.Locale == 0) ? LOCALE_USER_DEFAULT : langPack.Locale;
}
-MIR_CORE_DLL(wchar_t*) Langpack_PcharToTchar(const char *pszStr)
-{
- if (pszStr == nullptr)
- return nullptr;
-
- int len = (int)strlen(pszStr);
- wchar_t *result = (wchar_t*)alloca((len + 1)*sizeof(wchar_t));
- MultiByteToWideChar(Langpack_GetDefaultCodePage(), 0, pszStr, -1, result, len);
- result[len] = 0;
- return mir_wstrdup(TranslateW_LP(result));
-}
-
/////////////////////////////////////////////////////////////////////////////////////////
MIR_CORE_DLL(char*) TranslateA_LP(const char *str, HPLUGIN pPlugin)
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 062c0d01f0..c26da39e57 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -35,7 +35,6 @@ KillObjectServices @31 KillObjectThreads @32
Langpack_GetDefaultCodePage @34
Langpack_GetDefaultLocale @35
-Langpack_PcharToTchar @36
List_Copy @37
List_Create @38
List_Destroy @39
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 7e99275966..267d2af5c9 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -35,7 +35,6 @@ KillObjectServices @31 KillObjectThreads @32
Langpack_GetDefaultCodePage @34
Langpack_GetDefaultLocale @35
-Langpack_PcharToTchar @36
List_Copy @37
List_Create @38
List_Destroy @39
|