From 5975b2d0903bd5df128d55e20cd27d7c13b4e46c Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 16 Jun 2012 17:42:08 +0000 Subject: another portion of "#ifdef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/LangMan/options.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'plugins/LangMan/options.cpp') diff --git a/plugins/LangMan/options.cpp b/plugins/LangMan/options.cpp index 740790a8a9..a0c6aa70e0 100644 --- a/plugins/LangMan/options.cpp +++ b/plugins/LangMan/options.cpp @@ -197,15 +197,13 @@ static void DisplayNotIncludedPlugins(HWND hwndListBox, const LANGPACK_INFO *pac lstrcpy(szSearch, wfd.cFileName); /* buffer safe */ p = _tcsrchr(szSearch, _T('.')); if (p!=NULL) *p = _T('\0'); -#if defined(_UNICODE) + { char cFileNameA[MAX_PATH]; cFileNameA[0] = '\0'; WideCharToMultiByte(CP_ACP, 0, szSearch, -1, cFileNameA, sizeof(cFileNameA), NULL, NULL); if (IsPluginIncluded(pack, cFileNameA)) continue; } -#else - if (IsPluginIncluded(pack, szSearch)) continue; -#endif + /* friendly name of the plugin */ mir_sntprintf(szSearch, SIZEOF(szSearch), _T("%s\\Plugins\\%s"), szDir, wfd.cFileName); hModule = GetModuleHandle(szSearch); @@ -530,11 +528,11 @@ static INT_PTR CALLBACK LangOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP return TRUE; } break; -#if defined(_UNICODE) + case WM_NOTIFYFORMAT: SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, NFR_UNICODE); return TRUE; -#endif + case WM_NOTIFY: { NMHDR *nmhdr = (NMHDR*)lParam; switch(nmhdr->idFrom) { -- cgit v1.2.3