From 3bca7bf278057082d9eaef9b778d6076f70b0afe Mon Sep 17 00:00:00 2001 From: Don Ho Date: Thu, 18 Jul 2024 05:26:20 +0200 Subject: [PATCH] Use L"" instead of TEXT("") - Part 1 --- .../src/MISC/Common/verifySignedfile.cpp | 34 +- .../src/MISC/Common/verifySignedfile.h | 6 +- PowerEditor/src/MISC/Exception/MiniDumper.cpp | 16 +- PowerEditor/src/MISC/Process/Processus.cpp | 4 +- PowerEditor/src/MISC/Process/Processus.h | 8 +- PowerEditor/src/MISC/RegExt/regExtDlg.cpp | 84 ++-- PowerEditor/src/MISC/md5/md5Dlgs.cpp | 36 +- .../ScintillaComponent/FunctionCallTip.cpp | 30 +- .../src/ScintillaComponent/columnEditor.cpp | 12 +- .../AnsiCharPanel/ansiCharPanel.cpp | 14 +- .../AnsiCharPanel/asciiListView.cpp | 394 +++++++++--------- .../WinControls/ColourPicker/WordStyleDlg.cpp | 44 +- PowerEditor/src/WinControls/Grid/BabyGrid.cpp | 72 ++-- .../StaticDialog/RunDlg/RunDlg.cpp | 22 +- .../WinControls/StaticDialog/RunDlg/RunDlg.h | 22 +- PowerEditor/src/WinControls/TabBar/TabBar.cpp | 10 +- .../src/WinControls/ToolBar/ToolBar.cpp | 14 +- .../src/WinControls/TreeView/TreeView.cpp | 4 +- .../VerticalFileSwitcher.cpp | 10 +- .../VerticalFileSwitcherListView.cpp | 10 +- .../src/WinControls/WindowsDlg/WindowsDlg.cpp | 30 +- PowerEditor/src/clipboardFormats.h | 6 +- PowerEditor/src/localizationString.h | 188 ++++----- 23 files changed, 536 insertions(+), 534 deletions(-) diff --git a/PowerEditor/src/MISC/Common/verifySignedfile.cpp b/PowerEditor/src/MISC/Common/verifySignedfile.cpp index 4a166ba06..2a659d7b9 100644 --- a/PowerEditor/src/MISC/Common/verifySignedfile.cpp +++ b/PowerEditor/src/MISC/Common/verifySignedfile.cpp @@ -36,11 +36,11 @@ SecurityMode SecurityGuard::_securityMode = sm_certif; SecurityGuard::SecurityGuard() { - _gupSha256.push_back(TEXT("4c8191f511c2ad67148ef809b40c1108aaa074130547157c335a959404d8d6f6")); // v5.1 32 bit (signed) - _gupSha256.push_back(TEXT("268a65829e86d5c3d324eea79b51e59f0a7d07c69d3ba0f700c9cb3aa772566f")); // v5.1 64 bit (signed) + _gupSha256.push_back(L"4c8191f511c2ad67148ef809b40c1108aaa074130547157c335a959404d8d6f6"); // v5.1 32 bit (signed) + _gupSha256.push_back(L"268a65829e86d5c3d324eea79b51e59f0a7d07c69d3ba0f700c9cb3aa772566f"); // v5.1 64 bit (signed) - _pluginListSha256.push_back(TEXT("a4a7e57d605f29b294378d0d94fc867b9febd6a1cc63f1bb69bcb7609dc25f2c")); // v1.0.8 32 bit (unsigned) - _pluginListSha256.push_back(TEXT("1c404fd3578273f5ecde585af82179ff3b63c635fb4fa24be21ebde708e403e4")); // v1.0.8 64 bit (unsigned) + _pluginListSha256.push_back(L"a4a7e57d605f29b294378d0d94fc867b9febd6a1cc63f1bb69bcb7609dc25f2c"); // v1.0.8 32 bit (unsigned) + _pluginListSha256.push_back(L"1c404fd3578273f5ecde585af82179ff3b63c635fb4fa24be21ebde708e403e4"); // v1.0.8 64 bit (unsigned) } bool SecurityGuard::checkModule([[maybe_unused]] const std::wstring& filePath, [[maybe_unused]] NppModule module2check) @@ -91,12 +91,12 @@ bool SecurityGuard::checkSha256(const std::wstring& filePath, NppModule module2c { if (i == sha2hashStr) { - //::MessageBox(NULL, filePath.c_str(), TEXT("OK"), MB_OK); + //::MessageBox(NULL, filePath.c_str(), L"OK", MB_OK); return true; } } - //::MessageBox(NULL, filePath.c_str(), TEXT("KO"), MB_OK); + //::MessageBox(NULL, filePath.c_str(), L"KO", MB_OK); return false; } @@ -113,7 +113,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath) { string dmsg("VerifyLibrary: "); dmsg += ws2s(filepath); - writeLog(TEXT("c:\\tmp\\certifError.log"), dmsg.c_str()); + writeLog(L"c:\\tmp\\certifError.log", dmsg.c_str()); } // @@ -140,7 +140,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath) winTEXTrust_data.fdwRevocationChecks = WTD_REVOKE_NONE; if (doLogCertifError) - writeLog(TEXT("c:\\tmp\\certifError.log"), "VerifyLibrary: certificate revocation checking is disabled"); + writeLog(L"c:\\tmp\\certifError.log", "VerifyLibrary: certificate revocation checking is disabled"); } else { @@ -159,7 +159,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath) winTEXTrust_data.fdwRevocationChecks = WTD_REVOKE_NONE; if (doLogCertifError) - writeLog(TEXT("c:\\tmp\\certifError.log"), "VerifyLibrary: system is offline - certificate revocation wont be checked"); + writeLog(L"c:\\tmp\\certifError.log", "VerifyLibrary: system is offline - certificate revocation wont be checked"); } } @@ -176,7 +176,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath) if (vtrust) { if (doLogCertifError) - writeLog(TEXT("c:\\tmp\\certifError.log"), "VerifyLibrary: trust verification failed"); + writeLog(L"c:\\tmp\\certifError.log", "VerifyLibrary: trust verification failed"); return false; } @@ -184,7 +184,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath) if (t2) { if (doLogCertifError) - writeLog(TEXT("c:\\tmp\\certifError.log"), "VerifyLibrary: error encountered while cleaning up after WinVerifyTrust"); + writeLog(L"c:\\tmp\\certifError.log", "VerifyLibrary: error encountered while cleaning up after WinVerifyTrust"); return false; } @@ -277,7 +277,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath) key_id_hex = ss.str(); if (doLogCertifError) - writeLog(TEXT("c:\\tmp\\certifError.log"), ws2s(key_id_hex).c_str()); + writeLog(L"c:\\tmp\\certifError.log", ws2s(key_id_hex).c_str()); // Getting the display name auto sze = ::CertGetNameString(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, NULL, 0); @@ -300,14 +300,14 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath) { string msg = s; msg += " - VerifyLibrary: error while getting certificate informations"; - writeLog(TEXT("c:\\tmp\\certifError.log"), msg.c_str()); + writeLog(L"c:\\tmp\\certifError.log", msg.c_str()); } status = false; } catch (...) { // Unknown error if (doLogCertifError) - writeLog(TEXT("c:\\tmp\\certifError.log"), "VerifyLibrary: error while getting certificate informations"); + writeLog(L"c:\\tmp\\certifError.log", "VerifyLibrary: error while getting certificate informations"); status = false; } @@ -320,7 +320,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath) status = false; if (doLogCertifError) - writeLog(TEXT("c:\\tmp\\certifError.log"), "VerifyLibrary: Invalid certificate display name"); + writeLog(L"c:\\tmp\\certifError.log", "VerifyLibrary: Invalid certificate display name"); } if (status && (_signer_subject != subject)) @@ -328,7 +328,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath) status = false; if (doLogCertifError) - writeLog(TEXT("c:\\tmp\\certifError.log"), "VerifyLibrary: Invalid certificate subject"); + writeLog(L"c:\\tmp\\certifError.log", "VerifyLibrary: Invalid certificate subject"); } if (status && (_signer_key_id != key_id_hex)) @@ -336,7 +336,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath) status = false; if (doLogCertifError) - writeLog(TEXT("c:\\tmp\\certifError.log"), "VerifyLibrary: Invalid certificate key id"); + writeLog(L"c:\\tmp\\certifError.log", "VerifyLibrary: Invalid certificate key id"); } // Clean up. diff --git a/PowerEditor/src/MISC/Common/verifySignedfile.h b/PowerEditor/src/MISC/Common/verifySignedfile.h index fb5d54456..8d3f1682d 100644 --- a/PowerEditor/src/MISC/Common/verifySignedfile.h +++ b/PowerEditor/src/MISC/Common/verifySignedfile.h @@ -66,9 +66,9 @@ private: bool checkSha256(const std::wstring& filePath, NppModule module2check); // Code signing certificate - std::wstring _signer_display_name = TEXT("Notepad++"); - std::wstring _signer_subject = TEXT("C=FR, S=Ile-de-France, L=Saint Cloud, O=\"Notepad++\", CN=\"Notepad++\""); - std::wstring _signer_key_id = TEXT("E687332916D6B681FE28C5EF423CEE259D3953B9"); + std::wstring _signer_display_name = L"Notepad++"; + std::wstring _signer_subject = L"C=FR, S=Ile-de-France, L=Saint Cloud, O=\"Notepad++\", CN=\"Notepad++\""; + std::wstring _signer_key_id = L"E687332916D6B681FE28C5EF423CEE259D3953B9"; bool _doCheckRevocation = false; bool _doCheckChainOfTrust = false; diff --git a/PowerEditor/src/MISC/Exception/MiniDumper.cpp b/PowerEditor/src/MISC/Exception/MiniDumper.cpp index 61f6b2493..8ebb39f56 100644 --- a/PowerEditor/src/MISC/Exception/MiniDumper.cpp +++ b/PowerEditor/src/MISC/Exception/MiniDumper.cpp @@ -21,7 +21,7 @@ #include #include "MiniDumper.h" -LPCTSTR msgTitle = TEXT("Notepad++ crash analysis"); +LPCTSTR msgTitle = L"Notepad++ crash analysis"; MiniDumper::MiniDumper() { @@ -34,7 +34,7 @@ bool MiniDumper::writeDump(EXCEPTION_POINTERS * pExceptionInfo) LPCTSTR szResult = NULL; bool retval = false; - HMODULE hDll = ::LoadLibraryEx(TEXT("DBGHELP.DLL"), nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32); //that wont work on older windows version than XP, #care :) + HMODULE hDll = ::LoadLibraryEx(L"DBGHELP.DLL", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32); //that wont work on older windows version than XP, #care :) if (hDll) { @@ -43,7 +43,7 @@ bool MiniDumper::writeDump(EXCEPTION_POINTERS * pExceptionInfo) { ::GetModuleFileName(NULL, szDumpPath, MAX_PATH); ::PathRemoveFileSpec(szDumpPath); - wcscat_s(szDumpPath, TEXT("\\NppDump.dmp")); + wcscat_s(szDumpPath, L"\\NppDump.dmp"); // ask the user if they want to save a dump file int msgret = ::MessageBox(NULL, TEXT("Do you want to save a dump file?\r\nDoing so can aid in developing Notepad++."), msgTitle, MB_YESNO); @@ -65,33 +65,33 @@ bool MiniDumper::writeDump(EXCEPTION_POINTERS * pExceptionInfo) BOOL bOK = pDump( GetCurrentProcess(), GetCurrentProcessId(), hFile, MiniDumpNormal, &ExInfo, NULL, NULL ); if (bOK) { - wsprintf( szScratch, TEXT("Saved dump file to '%s'"), szDumpPath ); + wsprintf( szScratch, L"Saved dump file to '%s'", szDumpPath ); szResult = szScratch; retval = true; } else { - wsprintf( szScratch, TEXT("Failed to save dump file to '%s' (error %d)"), szDumpPath, GetLastError() ); + wsprintf( szScratch, L"Failed to save dump file to '%s' (error %d)", szDumpPath, GetLastError() ); szResult = szScratch; } ::CloseHandle(hFile); } else { - wsprintf( szScratch, TEXT("Failed to create dump file '%s' (error %d)"), szDumpPath, GetLastError() ); + wsprintf( szScratch, L"Failed to create dump file '%s' (error %d)", szDumpPath, GetLastError() ); szResult = szScratch; } } } else { - szResult = TEXT("The debugging DLL is outdated,\r\nfind a recent copy of dbghelp.dll and install it."); + szResult = L"The debugging DLL is outdated,\r\nfind a recent copy of dbghelp.dll and install it."; } ::FreeLibrary(hDll); } else { - szResult = TEXT("Unable to load the debugging DLL,\r\nfind a recent copy of dbghelp.dll and install it."); + szResult = L"Unable to load the debugging DLL,\r\nfind a recent copy of dbghelp.dll and install it."; } if (szResult) diff --git a/PowerEditor/src/MISC/Process/Processus.cpp b/PowerEditor/src/MISC/Process/Processus.cpp index d76b240b3..23b91ba63 100644 --- a/PowerEditor/src/MISC/Process/Processus.cpp +++ b/PowerEditor/src/MISC/Process/Processus.cpp @@ -21,7 +21,7 @@ void Process::run(bool isElevationRequired) const { - const TCHAR *opVerb = isElevationRequired ? TEXT("runas") : TEXT("open"); + const TCHAR *opVerb = isElevationRequired ? L"runas" : L"open"; ::ShellExecute(NULL, opVerb, _command.c_str(), _args.c_str(), _curDir.c_str(), SW_SHOWNORMAL); } @@ -31,7 +31,7 @@ unsigned long Process::runSync(bool isElevationRequired) const ShExecInfo.cbSize = sizeof(SHELLEXECUTEINFO); ShExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS; ShExecInfo.hwnd = NULL; - ShExecInfo.lpVerb = isElevationRequired ? TEXT("runas") : TEXT("open"); + ShExecInfo.lpVerb = isElevationRequired ? L"runas" : L"open"; ShExecInfo.lpFile = _command.c_str(); ShExecInfo.lpParameters = _args.c_str(); ShExecInfo.lpDirectory = _curDir.c_str(); diff --git a/PowerEditor/src/MISC/Process/Processus.h b/PowerEditor/src/MISC/Process/Processus.h index 20e9fe806..cabda2a39 100644 --- a/PowerEditor/src/MISC/Process/Processus.h +++ b/PowerEditor/src/MISC/Process/Processus.h @@ -24,15 +24,15 @@ enum progType {WIN32_PROG, CONSOLE_PROG}; class Process { public: - Process(const TCHAR *cmd, const TCHAR *args, const TCHAR *cDir) + Process(const wchar_t* cmd, const wchar_t* args, const wchar_t* cDir) :_command(cmd), _args(args), _curDir(cDir){} void run(bool isElevationRequired = false) const; unsigned long runSync(bool isElevationRequired = false) const; protected: - generic_string _command; - generic_string _args; - generic_string _curDir; + std::wstring _command; + std::wstring _args; + std::wstring _curDir; }; diff --git a/PowerEditor/src/MISC/RegExt/regExtDlg.cpp b/PowerEditor/src/MISC/RegExt/regExtDlg.cpp index ffbe15421..f31ff5c8d 100644 --- a/PowerEditor/src/MISC/RegExt/regExtDlg.cpp +++ b/PowerEditor/src/MISC/RegExt/regExtDlg.cpp @@ -20,9 +20,9 @@ -const TCHAR* nppName = TEXT("Notepad++_file"); -const TCHAR* nppBackup = TEXT("Notepad++_backup"); -const TCHAR* nppDoc = TEXT("Notepad++ Document"); +const TCHAR* nppName = L"Notepad++_file"; +const TCHAR* nppBackup = L"Notepad++_backup"; +const TCHAR* nppDoc = L"Notepad++ Document"; const int nbSupportedLang = 10; const int nbExtMax = 28; @@ -31,41 +31,41 @@ const int extNameMax = 18; const TCHAR defExtArray[nbSupportedLang][nbExtMax][extNameMax] = { - {TEXT("Notepad"), - TEXT(".txt"), TEXT(".log") + {L"Notepad", + L".txt", L".log" }, {TEXT("ms ini/inf"), - TEXT(".ini"), TEXT(".inf") + L".ini", L".inf" }, - {TEXT("c, c++, objc"), - TEXT(".h"), TEXT(".hh"), TEXT(".hpp"), TEXT(".hxx"), TEXT(".c"), TEXT(".cpp"), TEXT(".cxx"), TEXT(".cc"), - TEXT(".m"), TEXT(".mm"), - TEXT(".vcxproj"), TEXT(".vcproj"), TEXT(".props"), TEXT(".vsprops"), TEXT(".manifest") + {L"c, c++, objc", + L".h", L".hh", L".hpp", L".hxx", L".c", L".cpp", L".cxx", L".cc", + L".m", L".mm", + L".vcxproj", L".vcproj", L".props", L".vsprops", L".manifest" }, {TEXT("java, c#, pascal"), - TEXT(".java"), TEXT(".cs"), TEXT(".pas"), TEXT(".pp"), TEXT(".inc") + L".java", L".cs", L".pas", L".pp", L".inc" }, - {TEXT("web script"), - TEXT(".html"), TEXT(".htm"), TEXT(".shtml"), TEXT(".shtm"), TEXT(".hta"), - TEXT(".asp"), TEXT(".aspx"), - TEXT(".css"), TEXT(".js"), TEXT(".json"), TEXT(".mjs"), TEXT(".jsm"), TEXT(".jsp"), - TEXT(".php"), TEXT(".php3"), TEXT(".php4"), TEXT(".php5"), TEXT(".phps"), TEXT(".phpt"), TEXT(".phtml"), - TEXT(".xml"), TEXT(".xhtml"), TEXT(".xht"), TEXT(".xul"), TEXT(".kml"), TEXT(".xaml"), TEXT(".xsml") + {L"web script", + L".html", L".htm", L".shtml", L".shtm", L".hta", + L".asp", L".aspx", + L".css", L".js", L".json", L".mjs", L".jsm", L".jsp", + L".php", L".php3", L".php4", L".php5", L".phps", L".phpt", L".phtml", + L".xml", L".xhtml", L".xht", L".xul", L".kml", L".xaml", L".xsml" }, - {TEXT("public script"), - TEXT(".sh"), TEXT(".bsh"), TEXT(".bash"), TEXT(".bat"), TEXT(".cmd"), TEXT(".nsi"), - TEXT(".nsh"), TEXT(".lua"), TEXT(".pl"), TEXT(".pm"), TEXT(".py") + {L"public script", + L".sh", L".bsh", L".bash", L".bat", L".cmd", L".nsi", + L".nsh", L".lua", L".pl", L".pm", L".py" }, - {TEXT("property script"), - TEXT(".rc"), TEXT(".as"), TEXT(".mx"), TEXT(".vb"), TEXT(".vbs") + {L"property script", + L".rc", L".as", L".mx", L".vb", L".vbs" }, - {TEXT("fortran, TeX, SQL"), - TEXT(".f"), TEXT(".for"), TEXT(".f90"), TEXT(".f95"), TEXT(".f2k"), TEXT(".tex"), TEXT(".sql") + {L"fortran, TeX, SQL", + L".f", L".for", L".f90", L".f95", L".f2k", L".tex", L".sql" }, - {TEXT("misc"), - TEXT(".nfo"), TEXT(".mak") + {L"misc", + L".nfo", L".mak" }, - {TEXT("customize")} + {L"customize"} }; void RegExtDlg::doDialog(bool isRTL) @@ -171,7 +171,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa { writeNppPath(); - TCHAR ext2Add[extNameMax] = TEXT(""); + TCHAR ext2Add[extNameMax] = L""; if (!_isCustomize) { auto index2Add = ::SendDlgItemMessage(_hSelf, IDC_REGEXT_LANGEXT_LIST, LB_GETCURSEL, 0, 0); @@ -190,7 +190,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa if (i != LB_ERR) return TRUE; addExt(ext2Add); - ::SendDlgItemMessage(_hSelf, IDC_CUSTOMEXT_EDIT, WM_SETTEXT, 0, reinterpret_cast(TEXT(""))); + ::SendDlgItemMessage(_hSelf, IDC_CUSTOMEXT_EDIT, WM_SETTEXT, 0, reinterpret_cast(L"")); } ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_ADDSTRING, 0, reinterpret_cast(ext2Add)); ::EnableWindow(::GetDlgItem(_hSelf, IDC_ADDFROMLANGEXT_BUTTON), false); @@ -199,7 +199,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa case IDC_REMOVEEXT_BUTTON : { - TCHAR ext2Sup[extNameMax] = TEXT(""); + TCHAR ext2Sup[extNameMax] = L""; auto index2Sup = ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_GETCURSEL, 0, 0); auto lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_GETTEXTLEN, index2Sup, 0); if (lbTextLen > extNameMax - 1) @@ -235,7 +235,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa if (HIWORD(wParam) == EN_CHANGE) { - TCHAR text[extNameMax] = TEXT(""); + TCHAR text[extNameMax] = L""; ::SendDlgItemMessage(_hSelf, IDC_CUSTOMEXT_EDIT, WM_GETTEXT, extNameMax, reinterpret_cast(text)); if ((lstrlen(text) == 1) && (text[0] != '.')) { @@ -285,7 +285,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa for (int j = 1 ; j < nbExtMax ; ++j) { - if (lstrcmp(TEXT(""), defExtArray[i][j])) + if (lstrcmp(L"", defExtArray[i][j])) { auto index = ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_FINDSTRINGEXACT, 0, reinterpret_cast(defExtArray[i][j])); if (index == -1) @@ -337,7 +337,7 @@ void RegExtDlg::getRegisteredExts() HKEY hKey2Check; extNameActualLen = extNameLen; ::RegOpenKeyEx(HKEY_CLASSES_ROOT, extName, 0, KEY_ALL_ACCESS, &hKey2Check); - ::RegQueryValueEx(hKey2Check, TEXT(""), nullptr, &valType, reinterpret_cast(valData), &valDataLen); + ::RegQueryValueEx(hKey2Check, L"", nullptr, &valType, reinterpret_cast(valData), &valDataLen); if ((valType == REG_SZ) && (!lstrcmp(valData, nppName))) ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_ADDSTRING, 0, reinterpret_cast(extName)); @@ -369,7 +369,7 @@ void RegExtDlg::addExt(TCHAR *ext) if (dwDisp == REG_OPENED_EXISTING_KEY) { - int res = ::RegQueryValueEx(hKey, TEXT(""), nullptr, nullptr, reinterpret_cast(valData), &valDataLen); + int res = ::RegQueryValueEx(hKey, L"", nullptr, nullptr, reinterpret_cast(valData), &valDataLen); if (res == ERROR_SUCCESS) ::RegSetValueEx(hKey, nppBackup, 0, REG_SZ, reinterpret_cast(valData), valDataLen); } @@ -390,7 +390,7 @@ bool RegExtDlg::deleteExts(const TCHAR *ext2Delete) if ((nbValue <= 1) && (!nbSubkey)) { - TCHAR subKey[32] = TEXT("\\"); + TCHAR subKey[32] = L"\\"; wcscat_s(subKey, ext2Delete); ::RegDeleteKey(HKEY_CLASSES_ROOT, subKey); } @@ -419,8 +419,8 @@ void RegExtDlg::writeNppPath() HKEY hKey, hRootKey; DWORD dwDisp = 0; long nRet = 0; - generic_string regStr(nppName); - regStr += TEXT("\\shell\\open\\command"); + std::wstring regStr(nppName); + regStr += L"\\shell\\open\\command"; nRet = ::RegCreateKeyEx(HKEY_CLASSES_ROOT, regStr.c_str(), 0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &hKey, &dwDisp); @@ -437,9 +437,9 @@ void RegExtDlg::writeNppPath() TCHAR nppPath[MAX_PATH] = { '\0' }; ::GetModuleFileName(_hInst, nppPath, MAX_PATH); - TCHAR nppPathParam[MAX_PATH] = TEXT("\""); + TCHAR nppPathParam[MAX_PATH] = L"\""; wcscat_s(nppPathParam, nppPath); - wcscat_s(nppPathParam, TEXT("\" \"%1\"")); + wcscat_s(nppPathParam, L"\" \"%1\""); ::RegSetValueEx(hKey, nullptr, 0, REG_SZ, (LPBYTE)nppPathParam, static_cast((lstrlen(nppPathParam) + 1) * sizeof(TCHAR))); } @@ -448,7 +448,7 @@ void RegExtDlg::writeNppPath() //Set default icon value regStr = nppName; - regStr += TEXT("\\DefaultIcon"); + regStr += L"\\DefaultIcon"; nRet = ::RegCreateKeyEx(HKEY_CLASSES_ROOT, regStr.c_str(), 0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &hKey, &dwDisp); if (nRet == ERROR_SUCCESS) @@ -458,9 +458,9 @@ void RegExtDlg::writeNppPath() TCHAR nppPath[MAX_PATH] = { '\0' }; ::GetModuleFileName(_hInst, nppPath, MAX_PATH); - TCHAR nppPathParam[MAX_PATH] = TEXT("\""); + TCHAR nppPathParam[MAX_PATH] = L"\""; wcscat_s(nppPathParam, nppPath); - wcscat_s(nppPathParam, TEXT("\",0")); + wcscat_s(nppPathParam, L"\",0"); ::RegSetValueEx(hKey, nullptr, 0, REG_SZ, (LPBYTE)nppPathParam, static_cast((lstrlen(nppPathParam) + 1) * sizeof(TCHAR))); } diff --git a/PowerEditor/src/MISC/md5/md5Dlgs.cpp b/PowerEditor/src/MISC/md5/md5Dlgs.cpp index b5a6e5946..17d7b25c5 100644 --- a/PowerEditor/src/MISC/md5/md5Dlgs.cpp +++ b/PowerEditor/src/MISC/md5/md5Dlgs.cpp @@ -118,7 +118,7 @@ intptr_t CALLBACK HashFromFilesDlg::run_dlgProc(UINT message, WPARAM wParam, LPA case IDC_HASH_FILEBROWSER_BUTTON: { CustomFileDialog fDlg(_hSelf); - fDlg.setExtFilter(TEXT("All types"), TEXT(".*")); + fDlg.setExtFilter(L"All types", TEXT(".*")); const auto& fns = fDlg.doOpenMultiFilesDlg(); if (!fns.empty()) @@ -137,13 +137,13 @@ intptr_t CALLBACK HashFromFilesDlg::run_dlgProc(UINT message, WPARAM wParam, LPA if (md5Result) { files2check += it; - files2check += TEXT("\r\n"); + files2check += L"\r\n"; wchar_t* fileName = ::PathFindFileName(it.c_str()); hashResultStr += wmc.char2wchar(md5Result, CP_ACP); - hashResultStr += TEXT(" "); + hashResultStr += L" "; hashResultStr += fileName; - hashResultStr += TEXT("\r\n"); + hashResultStr += L"\r\n"; } } else @@ -179,16 +179,16 @@ intptr_t CALLBACK HashFromFilesDlg::run_dlgProc(UINT message, WPARAM wParam, LPA } for (int i = 0; i < _ht; i++) - wsprintf(hashStr + i * 2, TEXT("%02x"), hash[i]); + wsprintf(hashStr + i * 2, L"%02x", hash[i]); files2check += it; - files2check += TEXT("\r\n"); + files2check += L"\r\n"; wchar_t* fileName = ::PathFindFileName(it.c_str()); hashResultStr += hashStr; - hashResultStr += TEXT(" "); + hashResultStr += L" "; hashResultStr += fileName; - hashResultStr += TEXT("\r\n"); + hashResultStr += L"\r\n"; } } @@ -271,28 +271,28 @@ void HashFromFilesDlg::doDialog(bool isRTL) { case hash_md5: { - title = TEXT("Generate MD5 digest from files"); + title = L"Generate MD5 digest from files"; buttonText = TEXT("Choose files to &generate MD5..."); } break; case hash_sha1: { - title = TEXT("Generate SHA-1 digest from files"); + title = L"Generate SHA-1 digest from files"; buttonText = TEXT("Choose files to &generate SHA-1..."); } break; case hash_sha256: { - title = TEXT("Generate SHA-256 digest from files"); + title = L"Generate SHA-256 digest from files"; buttonText = TEXT("Choose files to &generate SHA-256..."); } break; case hash_sha512: { - title = TEXT("Generate SHA-1 digest from files"); + title = L"Generate SHA-1 digest from files"; buttonText = TEXT("Choose files to &generate SHA-512..."); } break; @@ -368,7 +368,7 @@ void HashFromTextDlg::generateHash() } for (int i = 0; i < _ht; i++) - wsprintf(hashStr + i * 2, TEXT("%02x"), hash[i]); + wsprintf(hashStr + i * 2, L"%02x", hash[i]); ::SetDlgItemText(_hSelf, IDC_HASH_RESULT_FOMTEXT_EDIT, hashStr); } @@ -479,7 +479,7 @@ intptr_t CALLBACK HashFromTextDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR { NppDarkMode::autoSubclassAndThemeChildControls(_hSelf); - _hFont = createFont(TEXT("Courier New"), 9, false, _hSelf); + _hFont = createFont(L"Courier New", 9, false, _hSelf); const HWND hHashTextEdit = ::GetDlgItem(_hSelf, IDC_HASH_TEXT_EDIT); const HWND hHashResult = ::GetDlgItem(_hSelf, IDC_HASH_RESULT_FOMTEXT_EDIT); @@ -633,25 +633,25 @@ void HashFromTextDlg::doDialog(bool isRTL) { case hash_md5: { - title = TEXT("Generate MD5 digest"); + title = L"Generate MD5 digest"; } break; case hash_sha1: { - title = TEXT("Generate SHA-1 digest"); + title = L"Generate SHA-1 digest"; } break; case hash_sha256: { - title = TEXT("Generate SHA-256 digest"); + title = L"Generate SHA-256 digest"; } break; case hash_sha512: { - title = TEXT("Generate SHA-512 digest"); + title = L"Generate SHA-512 digest"; } break; diff --git a/PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp b/PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp index 5f2b2c8d6..37ed5bdfa 100644 --- a/PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp +++ b/PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp @@ -145,7 +145,7 @@ bool FunctionCallTip::getCursorFunction() return false; //cannot be a func, need name and separator } - TCHAR lineData[maxLen] = TEXT(""); + TCHAR lineData[maxLen] = L""; _pEditView->getLine(line, lineData, len); @@ -298,10 +298,10 @@ bool FunctionCallTip::loadFunction() //Iterate through all keywords and find the correct function keyword TiXmlElement *funcNode = _pXmlKeyword; - for (; funcNode; funcNode = funcNode->NextSiblingElement(TEXT("KeyWord"))) + for (; funcNode; funcNode = funcNode->NextSiblingElement(L"KeyWord")) { const TCHAR * name = NULL; - name = funcNode->Attribute(TEXT("name")); + name = funcNode->Attribute(L"name"); if (!name) //malformed node continue; int compVal = 0; @@ -311,10 +311,10 @@ bool FunctionCallTip::loadFunction() compVal = lstrcmp(name, _funcName); if (!compVal) //found it! { - const TCHAR * val = funcNode->Attribute(TEXT("func")); + const TCHAR * val = funcNode->Attribute(L"func"); if (val) { - if (!lstrcmp(val, TEXT("yes"))) + if (!lstrcmp(val, L"yes")) { //what we've been looking for _curFunction = funcNode; @@ -335,25 +335,25 @@ bool FunctionCallTip::loadFunction() stringVec paramVec; - TiXmlElement *overloadNode = _curFunction->FirstChildElement(TEXT("Overload")); + TiXmlElement *overloadNode = _curFunction->FirstChildElement(L"Overload"); TiXmlElement *paramNode = NULL; - for (; overloadNode ; overloadNode = overloadNode->NextSiblingElement(TEXT("Overload")) ) + for (; overloadNode ; overloadNode = overloadNode->NextSiblingElement(L"Overload") ) { - const TCHAR * retVal = overloadNode->Attribute(TEXT("retVal")); + const TCHAR * retVal = overloadNode->Attribute(L"retVal"); if (!retVal) continue; //malformed node _retVals.push_back(retVal); - const TCHAR * description = overloadNode->Attribute(TEXT("descr")); + const TCHAR * description = overloadNode->Attribute(L"descr"); if (description) _descriptions.push_back(description); else - _descriptions.push_back(TEXT("")); //"no description available" + _descriptions.push_back(L""); //"no description available" - paramNode = overloadNode->FirstChildElement(TEXT("Param")); - for (; paramNode ; paramNode = paramNode->NextSiblingElement(TEXT("Param")) ) + paramNode = overloadNode->FirstChildElement(L"Param"); + for (; paramNode ; paramNode = paramNode->NextSiblingElement(L"Param") ) { - const TCHAR * param = paramNode->Attribute(TEXT("name")); + const TCHAR * param = paramNode->Attribute(L"name"); if (!param) continue; //malformed node paramVec.push_back(param); @@ -401,7 +401,7 @@ void FunctionCallTip::showCalltip() if (_currentNbOverloads > 1) { - callTipText << TEXT("\001") << _currentOverload + 1 << TEXT(" of ") << _currentNbOverloads << TEXT("\002"); + callTipText << L"\001" << _currentOverload + 1 << L" of " << _currentNbOverloads << L"\002"; } callTipText << _retVals.at(_currentOverload) << TEXT(' ') << _funcName << TEXT(' ') << _start; @@ -424,7 +424,7 @@ void FunctionCallTip::showCalltip() callTipText << _stop; if (_descriptions.at(_currentOverload)[0]) { - callTipText << TEXT("\n") << _descriptions.at(_currentOverload); + callTipText << L"\n" << _descriptions.at(_currentOverload); } if (isVisible()) diff --git a/PowerEditor/src/ScintillaComponent/columnEditor.cpp b/PowerEditor/src/ScintillaComponent/columnEditor.cpp index e415c67be..312e6bdfd 100644 --- a/PowerEditor/src/ScintillaComponent/columnEditor.cpp +++ b/PowerEditor/src/ScintillaComponent/columnEditor.cpp @@ -57,9 +57,9 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR if (colEditParam._repeatNum != -1) ::SetDlgItemInt(_hSelf, IDC_COL_REPEATNUM_EDIT, colEditParam._repeatNum, FALSE); - ::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("None"))); - ::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("Zeros"))); - ::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast(TEXT("Spaces"))); + ::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast(L"None")); + ::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast(L"Zeros")); + ::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast(L"Spaces")); WPARAM curSel = 0; switch (colEditParam._leadingChoice) { @@ -404,7 +404,7 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR { ::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize); - if (lstrcmp(str, TEXT("")) == 0) + if (lstrcmp(str, L"") == 0) { colEditParam._initialNum = -1; return TRUE; @@ -418,7 +418,7 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR { ::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize); - if (lstrcmp(str, TEXT("")) == 0) + if (lstrcmp(str, L"") == 0) { colEditParam._increaseNum = -1; return TRUE; @@ -432,7 +432,7 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR { ::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize); - if (lstrcmp(str, TEXT("")) == 0) + if (lstrcmp(str, L"") == 0) { colEditParam._repeatNum = -1; return TRUE; diff --git a/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp b/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp index 989d505f0..019402560 100644 --- a/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp +++ b/PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp @@ -19,6 +19,8 @@ #include "ScintillaEditView.h" #include "localization.h" +using namespace std; + void AnsiCharPanel::switchEncoding() { int codepage = (*_ppEditView)->getCurrentBuffer()->getEncoding(); @@ -33,12 +35,12 @@ intptr_t CALLBACK AnsiCharPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM { NppParameters& nppParam = NppParameters::getInstance(); NativeLangSpeaker *pNativeSpeaker = nppParam.getNativeLangSpeaker(); - generic_string valStr = pNativeSpeaker->getAttrNameStr(TEXT("Value"), "AsciiInsertion", "ColumnVal"); - generic_string hexStr = pNativeSpeaker->getAttrNameStr(TEXT("Hex"), "AsciiInsertion", "ColumnHex"); - generic_string charStr = pNativeSpeaker->getAttrNameStr(TEXT("Character"), "AsciiInsertion", "ColumnChar"); - generic_string htmlNameStr = pNativeSpeaker->getAttrNameStr(L"HTML Name", "AsciiInsertion", "ColumnHtmlName"); - generic_string htmlNumberStr = pNativeSpeaker->getAttrNameStr(L"HTML Decimal", "AsciiInsertion", "ColumnHtmlNumber"); - generic_string htmlHexNbStr = pNativeSpeaker->getAttrNameStr(L"HTML Hexadecimal", "AsciiInsertion", "ColumnHtmlHexNb"); + wstring valStr = pNativeSpeaker->getAttrNameStr(L"Value", "AsciiInsertion", "ColumnVal"); + wstring hexStr = pNativeSpeaker->getAttrNameStr(L"Hex", "AsciiInsertion", "ColumnHex"); + wstring charStr = pNativeSpeaker->getAttrNameStr(L"Character", "AsciiInsertion", "ColumnChar"); + wstring htmlNameStr = pNativeSpeaker->getAttrNameStr(L"HTML Name", "AsciiInsertion", "ColumnHtmlName"); + wstring htmlNumberStr = pNativeSpeaker->getAttrNameStr(L"HTML Decimal", "AsciiInsertion", "ColumnHtmlNumber"); + wstring htmlHexNbStr = pNativeSpeaker->getAttrNameStr(L"HTML Hexadecimal", "AsciiInsertion", "ColumnHtmlHexNb"); _listView.addColumn(columnInfo(valStr, nppParam._dpiManager.scaleX(45))); _listView.addColumn(columnInfo(hexStr, nppParam._dpiManager.scaleX(45))); diff --git a/PowerEditor/src/WinControls/AnsiCharPanel/asciiListView.cpp b/PowerEditor/src/WinControls/AnsiCharPanel/asciiListView.cpp index b1f0f8498..58155396a 100644 --- a/PowerEditor/src/WinControls/AnsiCharPanel/asciiListView.cpp +++ b/PowerEditor/src/WinControls/AnsiCharPanel/asciiListView.cpp @@ -35,73 +35,73 @@ generic_string AsciiListView::getAscii(unsigned char value) switch (value) { case 0: - return TEXT("NULL"); + return L"NULL"; case 1: - return TEXT("SOH"); + return L"SOH"; case 2: - return TEXT("STX"); + return L"STX"; case 3: - return TEXT("ETX"); + return L"ETX"; case 4: - return TEXT("EOT"); + return L"EOT"; case 5: - return TEXT("ENQ"); + return L"ENQ"; case 6: - return TEXT("ACK"); + return L"ACK"; case 7: - return TEXT("BEL"); + return L"BEL"; case 8: - return TEXT("BS"); + return L"BS"; case 9: - return TEXT("TAB"); + return L"TAB"; case 10: - return TEXT("LF"); + return L"LF"; case 11: - return TEXT("VT"); + return L"VT"; case 12: - return TEXT("FF"); + return L"FF"; case 13: - return TEXT("CR"); + return L"CR"; case 14: - return TEXT("SO"); + return L"SO"; case 15: - return TEXT("SI"); + return L"SI"; case 16: - return TEXT("DLE"); + return L"DLE"; case 17: - return TEXT("DC1"); + return L"DC1"; case 18: - return TEXT("DC2"); + return L"DC2"; case 19: - return TEXT("DC3"); + return L"DC3"; case 20: - return TEXT("DC4"); + return L"DC4"; case 21: - return TEXT("NAK"); + return L"NAK"; case 22: - return TEXT("SYN"); + return L"SYN"; case 23: - return TEXT("ETB"); + return L"ETB"; case 24: - return TEXT("CAN"); + return L"CAN"; case 25: - return TEXT("EM"); + return L"EM"; case 26: - return TEXT("SUB"); + return L"SUB"; case 27: - return TEXT("ESC"); + return L"ESC"; case 28: - return TEXT("FS"); + return L"FS"; case 29: - return TEXT("GS"); + return L"GS"; case 30: - return TEXT("RS"); + return L"RS"; case 31: - return TEXT("US"); + return L"US"; case 32: - return TEXT("Space"); + return L"Space"; case 127: - return TEXT("DEL"); + return L"DEL"; default: { wchar_t charStr[10]{}; @@ -120,318 +120,318 @@ generic_string AsciiListView::getHtmlName(unsigned char value) switch (value) { case 33: - return TEXT("!"); + return L"!"; case 34: - return TEXT("""); + return L"""; case 35: - return TEXT("#"); + return L"#"; case 36: - return TEXT("$"); + return L"$"; case 37: - return TEXT("%"); + return L"%"; case 38: - return TEXT("&"); + return L"&"; case 39: - return TEXT("'"); + return L"'"; case 40: - return TEXT("("); + return L"("; case 41: - return TEXT(")"); + return L")"; case 42: - return TEXT("*"); + return L"*"; case 43: - return TEXT("+"); + return L"+"; case 44: - return TEXT(","); + return L","; case 45: - return TEXT("−"); + return L"−"; case 46: - return TEXT("."); + return L"."; case 47: - return TEXT("/"); + return L"/"; case 58: - return TEXT(":"); + return L":"; case 59: - return TEXT(";"); + return L";"; case 60: - return TEXT("<"); + return L"<"; case 61: - return TEXT("="); + return L"="; case 62: - return TEXT(">"); + return L">"; case 63: - return TEXT("?"); + return L"?"; case 64: - return TEXT("@"); + return L"@"; case 91: - return TEXT("["); + return L"["; case 92: - return TEXT("\"); + return L"\"; case 93: - return TEXT("]"); + return L"]"; case 94: - return TEXT("^"); + return L"^"; case 95: - return TEXT("_"); + return L"_"; case 96: - return TEXT("`"); + return L"`"; case 123: - return TEXT("{"); + return L"{"; case 124: - return TEXT("|"); + return L"|"; case 125: - return TEXT("}"); + return L"}"; case 126: - return TEXT(""); // ascii tilde + return L""; // ascii tilde case 128: - return TEXT("€"); + return L"€"; case 130: - return TEXT("‚"); + return L"‚"; case 131: - return TEXT("ƒ"); + return L"ƒ"; case 132: - return TEXT("„"); + return L"„"; case 133: - return TEXT("…"); + return L"…"; case 134: - return TEXT("†"); + return L"†"; case 135: - return TEXT("‡"); + return L"‡"; case 136: - return TEXT("ˆ"); + return L"ˆ"; case 137: - return TEXT("‰"); + return L"‰"; case 138: - return TEXT("Š"); + return L"Š"; case 139: - return TEXT("‹"); + return L"‹"; case 140: - return TEXT("Œ"); + return L"Œ"; case 142: - return TEXT("Ž"); + return L"Ž"; case 145: - return TEXT("‘"); + return L"‘"; case 146: - return TEXT("’"); + return L"’"; case 147: - return TEXT("“"); + return L"“"; case 148: - return TEXT("”"); + return L"”"; case 149: - return TEXT("•"); + return L"•"; case 150: - return TEXT("–"); + return L"–"; case 151: - return TEXT("—"); + return L"—"; case 152: - return TEXT("˜"); + return L"˜"; case 153: - return TEXT("™"); + return L"™"; case 154: - return TEXT("š"); + return L"š"; case 155: - return TEXT("›"); + return L"›"; case 156: - return TEXT("œ"); + return L"œ"; case 158: - return TEXT("ž"); + return L"ž"; case 159: - return TEXT("Ÿ"); + return L"Ÿ"; case 160: - return TEXT(" "); + return L" "; case 161: - return TEXT("¡"); + return L"¡"; case 162: - return TEXT("¢"); + return L"¢"; case 163: - return TEXT("£"); + return L"£"; case 164: - return TEXT("¤"); + return L"¤"; case 165: - return TEXT("¥"); + return L"¥"; case 166: - return TEXT("¦"); + return L"¦"; case 167: - return TEXT("§"); + return L"§"; case 168: - return TEXT("¨"); + return L"¨"; case 169: - return TEXT("©"); + return L"©"; case 170: - return TEXT("ª"); + return L"ª"; case 171: - return TEXT("«"); + return L"«"; case 172: - return TEXT("¬"); + return L"¬"; case 173: - return TEXT("­"); + return L"­"; case 174: - return TEXT("®"); + return L"®"; case 175: - return TEXT("¯"); + return L"¯"; case 176: - return TEXT("°"); + return L"°"; case 177: - return TEXT("±"); + return L"±"; case 178: - return TEXT("²"); + return L"²"; case 179: - return TEXT("³"); + return L"³"; case 180: - return TEXT("´"); + return L"´"; case 181: - return TEXT("µ"); + return L"µ"; case 182: - return TEXT("¶"); + return L"¶"; case 183: - return TEXT("·"); + return L"·"; case 184: - return TEXT("¸"); + return L"¸"; case 185: - return TEXT("¹"); + return L"¹"; case 186: - return TEXT("º"); + return L"º"; case 187: - return TEXT("»"); + return L"»"; case 188: - return TEXT("¼"); + return L"¼"; case 189: - return TEXT("½"); + return L"½"; case 190: - return TEXT("¾"); + return L"¾"; case 191: - return TEXT("¿"); + return L"¿"; case 192: - return TEXT("À"); + return L"À"; case 193: - return TEXT("Á"); + return L"Á"; case 194: - return TEXT("Â"); + return L"Â"; case 195: - return TEXT("Ã"); + return L"Ã"; case 196: - return TEXT("Ä"); + return L"Ä"; case 197: - return TEXT("Å"); + return L"Å"; case 198: - return TEXT("Æ"); + return L"Æ"; case 199: - return TEXT("Ç"); + return L"Ç"; case 200: - return TEXT("È"); + return L"È"; case 201: - return TEXT("É"); + return L"É"; case 202: - return TEXT("Ê"); + return L"Ê"; case 203: - return TEXT("Ë"); + return L"Ë"; case 204: - return TEXT("Ì"); + return L"Ì"; case 205: - return TEXT("Í"); + return L"Í"; case 206: - return TEXT("Î"); + return L"Î"; case 207: - return TEXT("Ï"); + return L"Ï"; case 208: - return TEXT("Ð"); + return L"Ð"; case 209: - return TEXT("Ñ"); + return L"Ñ"; case 210: - return TEXT("Ò"); + return L"Ò"; case 211: - return TEXT("Ó"); + return L"Ó"; case 212: - return TEXT("Ô"); + return L"Ô"; case 213: - return TEXT("Õ"); + return L"Õ"; case 214: - return TEXT("Ö"); + return L"Ö"; case 215: - return TEXT("×"); + return L"×"; case 216: - return TEXT("Ø"); + return L"Ø"; case 217: - return TEXT("Ù"); + return L"Ù"; case 218: - return TEXT("Ú"); + return L"Ú"; case 219: - return TEXT("Û"); + return L"Û"; case 220: - return TEXT("Ü"); + return L"Ü"; case 221: - return TEXT("Ý"); + return L"Ý"; case 222: - return TEXT("Þ"); + return L"Þ"; case 223: - return TEXT("ß"); + return L"ß"; case 224: - return TEXT("à"); + return L"à"; case 225: - return TEXT("á"); + return L"á"; case 226: - return TEXT("â"); + return L"â"; case 227: - return TEXT("ã"); + return L"ã"; case 228: - return TEXT("ä"); + return L"ä"; case 229: - return TEXT("å"); + return L"å"; case 230: - return TEXT("æ"); + return L"æ"; case 231: - return TEXT("ç"); + return L"ç"; case 232: - return TEXT("è"); + return L"è"; case 233: - return TEXT("é"); + return L"é"; case 234: - return TEXT("ê"); + return L"ê"; case 235: - return TEXT("ë"); + return L"ë"; case 236: - return TEXT("ì"); + return L"ì"; case 237: - return TEXT("í"); + return L"í"; case 238: - return TEXT("î"); + return L"î"; case 239: - return TEXT("ï"); + return L"ï"; case 240: - return TEXT("ð"); + return L"ð"; case 241: - return TEXT("ñ"); + return L"ñ"; case 242: - return TEXT("ò"); + return L"ò"; case 243: - return TEXT("ó"); + return L"ó"; case 244: - return TEXT("ô"); + return L"ô"; case 245: - return TEXT("õ"); + return L"õ"; case 246: - return TEXT("ö"); + return L"ö"; case 247: - return TEXT("÷"); + return L"÷"; case 248: - return TEXT("ø"); + return L"ø"; case 249: - return TEXT("ù"); + return L"ù"; case 250: - return TEXT("ú"); + return L"ú"; case 251: - return TEXT("û"); + return L"û"; case 252: - return TEXT("ü"); + return L"ü"; case 253: - return TEXT("ý"); + return L"ý"; case 254: - return TEXT("þ"); + return L"þ"; case 255: - return TEXT("ÿ"); + return L"ÿ"; default: { - return TEXT(""); + return L""; } } } @@ -516,8 +516,8 @@ void AsciiListView::setValues(int codepage) wchar_t htmlNumber[bufSize]{}; wchar_t htmlHexNumber[bufSizeHex]{}; generic_string htmlName; - swprintf(dec, bufSize, TEXT("%d"), i); - swprintf(hex, bufSize, TEXT("%02X"), i); + swprintf(dec, bufSize, L"%d", i); + swprintf(hex, bufSize, L"%02X", i); generic_string s = getAscii(static_cast(i)); if (codepage == 0 || codepage == 1252) @@ -537,8 +537,8 @@ void AsciiListView::setValues(int codepage) } else { - swprintf(htmlNumber, bufSize, TEXT("")); - swprintf(htmlHexNumber, bufSizeHex, TEXT("")); + swprintf(htmlNumber, bufSize, L""); + swprintf(htmlHexNumber, bufSizeHex, L""); } } @@ -546,9 +546,9 @@ void AsciiListView::setValues(int codepage) } else { - swprintf(htmlNumber, bufSize, TEXT("")); - swprintf(htmlHexNumber, bufSizeHex, TEXT("")); - htmlName = TEXT(""); + swprintf(htmlNumber, bufSize, L""); + swprintf(htmlHexNumber, bufSizeHex, L""); + htmlName = L""; } std::vector values2Add; diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 8e1145a18..89b66eeb3 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -110,7 +110,7 @@ intptr_t CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM _currentThemeIndex = j; _themeName.assign(themeInfo.second); } - if (! themeInfo.first.compare(TEXT("Default")) ) + if (! themeInfo.first.compare(L"Default") ) { defaultThemeIndex = j; } @@ -153,7 +153,7 @@ intptr_t CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM setVisualFromStyleList(); _goToSettings.init(_hInst, _hSelf); - _goToSettings.create(::GetDlgItem(_hSelf, IDC_GLOBAL_GOTOSETTINGS_LINK), TEXT("")); + _goToSettings.create(::GetDlgItem(_hSelf, IDC_GLOBAL_GOTOSETTINGS_LINK), L""); std::pair pageAndCtrlID = goToPreferencesSettings(); _goToSettings.display(pageAndCtrlID.first != -1); @@ -205,7 +205,7 @@ intptr_t CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM isTextEnabled = HIBYTE(HIWORD(style._fgColor)) != 0xFF; // Selected text colour style - if (style._styleDesc == TEXT("Selected text colour")) + if (style._styleDesc == L"Selected text colour") { isTextEnabled = NppParameters::getInstance().isSelectFgColorEnabled(); } @@ -599,7 +599,7 @@ void WordStyleDlg::loadLangListFromNppParam() // Clean up Language List ::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_RESETCONTENT, 0, 0); - ::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_ADDSTRING, 0, reinterpret_cast(TEXT("Global Styles"))); + ::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_ADDSTRING, 0, reinterpret_cast(L"Global Styles")); // All the lexers for (size_t i = 0, nb = _lsArray.getNbLexer() ; i < nb ; ++i) { @@ -950,27 +950,27 @@ std::pair WordStyleDlg::goToPreferencesSettings() const Style& style = getCurrentStyler(); // Global override style - if (style._styleDesc == TEXT("Current line background colour")) + if (style._styleDesc == L"Current line background colour") { result.first = edit1; result.second = IDC_RADIO_CLM_HILITE; } - else if (style._styleDesc == TEXT("Caret colour")) + else if (style._styleDesc == L"Caret colour") { result.first = edit1; result.second = IDC_WIDTH_COMBO; } - else if (style._styleDesc == TEXT("Edge colour")) + else if (style._styleDesc == L"Edge colour") { result.first = margins; result.second = IDC_COLUMNPOS_EDIT; } - else if (style._styleDesc == TEXT("Line number margin")) + else if (style._styleDesc == L"Line number margin") { result.first = margins; result.second = IDC_CHECK_LINENUMBERMARGE; } - else if (style._styleDesc == TEXT("Bookmark margin")) + else if (style._styleDesc == L"Bookmark margin") { result.first = margins; result.second = IDC_CHECK_BOOKMARKMARGE; @@ -982,38 +982,38 @@ std::pair WordStyleDlg::goToPreferencesSettings() result.first = margins; result.second = IDC_CHECK_CHANGHISTORYMARGIN; } - else if (style._styleDesc == TEXT("Fold") || style._styleDesc == TEXT("Fold active") || style._styleDesc == TEXT("Fold margin")) + else if (style._styleDesc == L"Fold" || style._styleDesc == L"Fold active" || style._styleDesc == L"Fold margin") { result.first = margins; result.second = IDC_RADIO_BOX; } - else if (style._styleDesc == TEXT("Smart Highlighting")) + else if (style._styleDesc == L"Smart Highlighting") { result.first = highlighting; result.second = IDC_CHECK_ENABLSMARTHILITE; } - else if (style._styleDesc == TEXT("Tags match highlighting")) + else if (style._styleDesc == L"Tags match highlighting") { result.first = highlighting; result.second = IDC_CHECK_ENABLTAGSMATCHHILITE; } - else if (style._styleDesc == TEXT("Tags attribute")) + else if (style._styleDesc == L"Tags attribute") { result.first = highlighting; result.second = IDC_CHECK_ENABLTAGATTRHILITE; } - else if (style._styleDesc == TEXT("Mark Style 1") || style._styleDesc == TEXT("Mark Style 2") || style._styleDesc == TEXT("Mark Style 3") - || style._styleDesc == TEXT("Mark Style 4") || style._styleDesc == TEXT("Mark Style 5")) + else if (style._styleDesc == L"Mark Style 1" || style._styleDesc == L"Mark Style 2" || style._styleDesc == L"Mark Style 3" + || style._styleDesc == L"Mark Style 4" || style._styleDesc == L"Mark Style 5") { result.first = highlighting; result.second = IDC_CHECK_MARKALLCASESENSITIVE; } - else if (style._styleDesc == TEXT("URL hovered")) + else if (style._styleDesc == L"URL hovered") { result.first = cloudAndLink; result.second = IDC_CHECK_CLICKABLELINK_ENABLE; } - else if (style._styleDesc == TEXT("EOL custom color")) + else if (style._styleDesc == L"EOL custom color") { result.first = edit2; result.second = IDC_CHECK_WITHCUSTOMCOLOR_CRLF; @@ -1034,7 +1034,7 @@ void WordStyleDlg::setVisualFromStyleList() Style & style = getCurrentStyler(); // Global override style - if (style._styleDesc == TEXT("Global override")) + if (style._styleDesc == L"Global override") { showGlobalOverrideCtrls(true); } @@ -1073,7 +1073,7 @@ void WordStyleDlg::setVisualFromStyleList() wcscat_s(str, styleName); // PAD for fix a display glitch - wcscat_s(str, TEXT(" ")); + wcscat_s(str, L" "); _colourHooker.setColour(c); ::SetWindowText(_hStyleInfoStaticText, str); @@ -1087,7 +1087,7 @@ void WordStyleDlg::setVisualFromStyleList() } // Selected text colour style - if (style._styleDesc == TEXT("Selected text colour")) + if (style._styleDesc == L"Selected text colour") { isEnable = false; // disable by default for "Selected text colour" style @@ -1126,7 +1126,7 @@ void WordStyleDlg::setVisualFromStyleList() LRESULT iFontSize = 0; if (style._fontSize != STYLE_NOT_USED && style._fontSize < 100) // style._fontSize has only 2 digits { - wsprintf(intStr, TEXT("%d"), style._fontSize); + wsprintf(intStr, L"%d", style._fontSize); iFontSize = ::SendMessage(_hFontSizeCombo, CB_FINDSTRING, 1, reinterpret_cast(intStr)); } ::SendMessage(_hFontSizeCombo, CB_SETCURSEL, iFontSize, 0); @@ -1169,7 +1169,7 @@ void WordStyleDlg::setVisualFromStyleList() } const TCHAR *kws = nppParams.getWordList(lType, style._keywordClass); if (!kws) - kws = TEXT(""); + kws = L""; ::SendDlgItemMessage(_hSelf, IDC_DEF_KEYWORDS_EDIT, WM_SETTEXT, 0, reinterpret_cast(kws)); const TCHAR *ckwStr = style._keywords.c_str(); diff --git a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp index ce7db1868..e2534a0f7 100644 --- a/PowerEditor/src/WinControls/Grid/BabyGrid.cpp +++ b/PowerEditor/src/WinControls/Grid/BabyGrid.cpp @@ -140,7 +140,7 @@ void RefreshGrid(HWND hWnd) int SI = FindGrid(GetMenu(hWnd)); if (SI >= 0 && BGHS[SI].EDITING) { - DisplayEditString(hWnd, SI, TEXT("")); + DisplayEditString(hWnd, SI, L""); } } @@ -414,7 +414,7 @@ void DisplayColumn(HWND hWnd, int SI, int c, int offset, HFONT hfont, HFONT hcol SetCell(&BGcell, r, c); TCHAR buffer[bufferLen]{}; - wcscpy_s(buffer, TEXT("")); + wcscpy_s(buffer, L""); if (BGHS[SI].COLUMNSNUMBERED) { if (c > 0) @@ -426,7 +426,7 @@ void DisplayColumn(HWND hWnd, int SI, int c, int offset, HFONT hfont, HFONT hcol else { high += 64; } if (low == 0) { low = 26; } low += 64; - wsprintf(buffer, TEXT("%c%c"), high, low); + wsprintf(buffer, L"%c%c", high, low); } } else @@ -474,11 +474,11 @@ void DisplayColumn(HWND hWnd, int SI, int c, int offset, HFONT hfont, HFONT hcol BGCELL BGcell; SetCell(&BGcell, r, c); - wcscpy_s(buffer, TEXT("")); + wcscpy_s(buffer, L""); int iProperty = 0; if ((c == 0) && (BGHS[SI].ROWSNUMBERED)) { - wsprintf(buffer, TEXT("%d"), r); + wsprintf(buffer, L"%d", r); iProperty = 2 << 4; // iDataType = NUMERIC } else @@ -627,7 +627,7 @@ void DisplayColumn(HWND hWnd, int SI, int c, int offset, HFONT hfont, HFONT hcol if (BGHS[SI].EDITING) { - DisplayEditString(hWnd, SI, TEXT("")); + DisplayEditString(hWnd, SI, L""); } rect = rectsave; @@ -1029,7 +1029,7 @@ void CloseEdit(HWND hWnd, int SI) cell.row = r; cell.col = c; SendMessage(hWnd, BGM_SETCELLDATA, reinterpret_cast(&cell), reinterpret_cast(BGHS[SI].editstring)); - wcscpy_s(BGHS[SI].editstring, TEXT("")); + wcscpy_s(BGHS[SI].editstring, L""); RefreshGrid(hWnd); BGHS[SI].EDITING = FALSE; HideCaret(hWnd); @@ -1106,7 +1106,7 @@ ATOM RegisterGridClass(HINSTANCE hInstance) wclass.hCursor = ::LoadCursor(NULL, IDC_ARROW); wclass.hbrBackground = (HBRUSH)(GetStockObject(GRAY_BRUSH)); - wclass.lpszClassName = TEXT("BABYGRID"); + wclass.lpszClassName = L"BABYGRID"; wclass.lpszMenuName = NULL; return RegisterClass(&wclass); @@ -1122,7 +1122,7 @@ int FindLongestLine(HDC hdc, wchar_t* text, SIZE* size) { int longest = 0; wchar_t* buffer = nullptr; - wchar_t* token = WCSTOK(text, TEXT("\n"), &buffer); + wchar_t* token = WCSTOK(text, L"\n", &buffer); while (token) { @@ -1132,7 +1132,7 @@ int FindLongestLine(HDC hdc, wchar_t* text, SIZE* size) longest = size->cx; } - token = WCSTOK(nullptr, TEXT("\n"), &buffer); + token = WCSTOK(nullptr, L"\n", &buffer); } return longest; } @@ -1223,7 +1223,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { if (lstrlen((TCHAR*)lParam) > 300) { - wcscpy_s(BGHS[SelfIndex].title, TEXT("Title too long (300 chars max)")); + wcscpy_s(BGHS[SelfIndex].title, L"Title too long (300 chars max)"); } else { @@ -1363,7 +1363,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ReturnValue = -1; break; } - wsprintf(buffer, TEXT("%05d-%03d"), LPBGcell->row, LPBGcell->col); + wsprintf(buffer, L"%05d-%03d", LPBGcell->row, LPBGcell->col); //see if that cell is already loaded int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer); if (FindResult != LB_ERR) @@ -1392,11 +1392,11 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) wcscat_s(buffer, TEXT("|")); if ((BOOL)lParam) { - wcscat_s(buffer, TEXT("PA")); + wcscat_s(buffer, L"PA"); } else { - wcscat_s(buffer, TEXT("UA")); + wcscat_s(buffer, L"UA"); } wcscat_s(buffer, TEXT("|")); SendMessage(BGHS[SelfIndex].hlist1, LB_ADDSTRING, FindResult, reinterpret_cast(buffer)); @@ -1413,11 +1413,11 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case BGM_SETPROTECT: if ((BOOL)wParam) { - wcscpy_s(BGHS[SelfIndex].protect, TEXT("P")); + wcscpy_s(BGHS[SelfIndex].protect, L"P"); } else { - wcscpy_s(BGHS[SelfIndex].protect, TEXT("U")); + wcscpy_s(BGHS[SelfIndex].protect, L"U"); } break; @@ -1453,7 +1453,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ReturnValue = -1; break; } - wsprintf(buffer, TEXT("%05d-%03d"), LPBGcell->row, LPBGcell->col); + wsprintf(buffer, L"%05d-%03d", LPBGcell->row, LPBGcell->col); if (!BGHS[SelfIndex].INITIALCONTENT) // performance enhancement while adding new data { @@ -1472,11 +1472,11 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) int iDataType = 1; - if (iDataType == 1) { wcscat_s(buffer, TEXT("A")); } - if (iDataType == 2) { wcscat_s(buffer, TEXT("N")); } - if (iDataType == 3) { wcscat_s(buffer, TEXT("T")); } - if (iDataType == 4) { wcscat_s(buffer, TEXT("F")); } - if (iDataType == 5) { wcscat_s(buffer, TEXT("G")); } + if (iDataType == 1) { wcscat_s(buffer, L"A"); } + if (iDataType == 2) { wcscat_s(buffer, L"N"); } + if (iDataType == 3) { wcscat_s(buffer, L"T"); } + if (iDataType == 4) { wcscat_s(buffer, L"F"); } + if (iDataType == 5) { wcscat_s(buffer, L"G"); } wcscat_s(buffer, TEXT("|")); wcscat_s(buffer, (TCHAR*)lParam); @@ -1591,7 +1591,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ReturnValue = -1; break; } - wsprintf(buffer, TEXT("%05d-%03d"), LPBGcell->row, LPBGcell->col); + wsprintf(buffer, L"%05d-%03d", LPBGcell->row, LPBGcell->col); //see if that cell is already loaded int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer); if (FindResult != LB_ERR) @@ -1631,7 +1631,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } else { - wcscpy_s((TCHAR*)lParam, bufferLen, TEXT("")); + wcscpy_s((TCHAR*)lParam, bufferLen, L""); } } break; @@ -1660,7 +1660,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ReturnValue = -1; break; } - wsprintf(buffer, TEXT("%05d-%03d"), LPBGcell->row, LPBGcell->col); + wsprintf(buffer, L"%05d-%03d", LPBGcell->row, LPBGcell->col); //see if that cell is already loaded int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer); if (FindResult != LB_ERR) @@ -1748,7 +1748,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ReturnValue = -1; break; } - wsprintf(buffer, TEXT("%05d-%03d"), LPBGcell->row, LPBGcell->col); + wsprintf(buffer, L"%05d-%03d", LPBGcell->row, LPBGcell->col); //see if that cell is already loaded int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer); if (FindResult != LB_ERR) @@ -1782,7 +1782,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ReturnValue = -1; break; } - wsprintf(buffer, TEXT("%05d-%03d"), LPBGcell->row, LPBGcell->col); + wsprintf(buffer, L"%05d-%03d", LPBGcell->row, LPBGcell->col); //see if that cell is already loaded ReturnValue = 0; int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer); @@ -2191,7 +2191,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) if (BGHS[SelfIndex].EDITING) { BGHS[SelfIndex].EDITING = FALSE; - wcscpy_s(BGHS[SelfIndex].editstring, TEXT("")); + wcscpy_s(BGHS[SelfIndex].editstring, L""); HideCaret(hWnd); RefreshGrid(hWnd); NotifyEditEnd(hWnd, SelfIndex); @@ -2211,7 +2211,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) if (BGHS[SelfIndex].EDITING) { BGHS[SelfIndex].EDITING = FALSE; - wcscpy_s(BGHS[SelfIndex].editstring, TEXT("")); + wcscpy_s(BGHS[SelfIndex].editstring, L""); HideCaret(hWnd); RefreshGrid(hWnd); NotifyEditEnd(hWnd, SelfIndex); @@ -2467,7 +2467,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) BGHS[SelfIndex].EDITING = TRUE; if (lstrlen(BGHS[SelfIndex].editstring) == 0) { - DisplayEditString(hWnd, SelfIndex, TEXT("")); + DisplayEditString(hWnd, SelfIndex, L""); break; } else @@ -2475,7 +2475,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) int j; j = lstrlen(BGHS[SelfIndex].editstring); BGHS[SelfIndex].editstring[j - 1] = 0x00; - DisplayEditString(hWnd, SelfIndex, TEXT("")); + DisplayEditString(hWnd, SelfIndex, L""); } break; } @@ -2691,7 +2691,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) BGHS[SelfIndex].gridmenu = 0; BGHS[SelfIndex].hlist1 = NULL; BGHS[SelfIndex].hfont = NULL; - wcscpy_s(BGHS[SelfIndex].protect, TEXT("U")); + wcscpy_s(BGHS[SelfIndex].protect, L"U"); BGHS[SelfIndex].rows = 100; BGHS[SelfIndex].cols = 255; BGHS[SelfIndex].homerow = 1; @@ -2832,9 +2832,9 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) CLIP_DEFAULT_PRECIS, 0, 0, - TEXT("MS Shell Dlg")); - g_hfontheader = CreateFont(18, 0, 0, 0, FW_HEAVY, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, 0, 0, TEXT("MS Shell Dlg")); - g_hfonttitle = CreateFont(20, 0, 0, 0, FW_HEAVY, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, 0, 0, TEXT("MS Shell Dlg")); + L"MS Shell Dlg"); + g_hfontheader = CreateFont(18, 0, 0, 0, FW_HEAVY, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, 0, 0, L"MS Shell Dlg"); + g_hfonttitle = CreateFont(20, 0, 0, 0, FW_HEAVY, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, 0, 0, L"MS Shell Dlg"); } @@ -2843,7 +2843,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) BGHS[BG_GridIndex].gridmenu = GetMenu(hWnd); - BGHS[BG_GridIndex].hlist1 = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("LISTBOX"), TEXT(""), + BGHS[BG_GridIndex].hlist1 = CreateWindowEx(WS_EX_CLIENTEDGE, L"LISTBOX", L"", WS_CHILD | LBS_STANDARD, 50, 150, 200, 100, hWnd, NULL, hInst, NULL); BGHS[BG_GridIndex].hfont = g_hfontbody; diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp index eb3a00445..d813d1ba3 100644 --- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp +++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp @@ -182,7 +182,7 @@ void expandNppEnvironmentStrs(const TCHAR *strSrc, TCHAR *stringDest, size_t str HINSTANCE Command::run(HWND hWnd) { - return run(hWnd, TEXT(".")); + return run(hWnd, L"."); } HINSTANCE Command::run(HWND hWnd, const TCHAR* cwd) @@ -216,7 +216,7 @@ HINSTANCE Command::run(HWND hWnd, const TCHAR* cwd) TCHAR cwd2Exec[MAX_PATH]{}; expandNppEnvironmentStrs(cwd, cwd2Exec, MAX_PATH, hWnd); - HINSTANCE res = ::ShellExecute(hWnd, TEXT("open"), cmd2Exec, args2Exec, cwd2Exec, SW_SHOW); + HINSTANCE res = ::ShellExecute(hWnd, L"open", cmd2Exec, args2Exec, cwd2Exec, SW_SHOW); // As per MSDN (https://msdn.microsoft.com/en-us/library/windows/desktop/bb762153(v=vs.85).aspx) // If the function succeeds, it returns a value greater than 32. @@ -226,17 +226,17 @@ HINSTANCE Command::run(HWND hWnd, const TCHAR* cwd) { generic_string errorMsg; errorMsg += GetLastErrorAsString(retResult); - errorMsg += TEXT("An attempt was made to execute the below command."); - errorMsg += TEXT("\n----------------------------------------------------------"); - errorMsg += TEXT("\nCommand: "); + errorMsg += L"An attempt was made to execute the below command."; + errorMsg += L"\n----------------------------------------------------------"; + errorMsg += L"\nCommand: "; errorMsg += cmd2Exec; - errorMsg += TEXT("\nArguments: "); + errorMsg += L"\nArguments: "; errorMsg += args2Exec; - errorMsg += TEXT("\nError Code: "); + errorMsg += L"\nError Code: "; errorMsg += intToString(retResult); - errorMsg += TEXT("\n----------------------------------------------------------"); + errorMsg += L"\n----------------------------------------------------------"; - ::MessageBox(hWnd, errorMsg.c_str(), TEXT("ShellExecute - ERROR"), MB_ICONINFORMATION | MB_APPLMODAL); + ::MessageBox(hWnd, errorMsg.c_str(), L"ShellExecute - ERROR", MB_ICONINFORMATION | MB_APPLMODAL); } return res; @@ -382,7 +382,7 @@ intptr_t CALLBACK RunDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam ::InsertMenu(hRunMenu, posBase + nbTopLevelItem + 1, MF_BYPOSITION, static_cast(-1), 0); NativeLangSpeaker *pNativeLangSpeaker = nppParams.getNativeLangSpeaker(); generic_string nativeLangShortcutMapperMacro = pNativeLangSpeaker->getNativeLangMenuString(IDM_SETTING_SHORTCUT_MAPPER_MACRO); - if (nativeLangShortcutMapperMacro == TEXT("")) + if (nativeLangShortcutMapperMacro == L"") nativeLangShortcutMapperMacro = runMenu.getLastCmdLabel(); ::InsertMenu(hRunMenu, posBase + nbTopLevelItem + 2, MF_BYCOMMAND, IDM_SETTING_SHORTCUT_MAPPER_RUN, nativeLangShortcutMapperMacro.c_str()); @@ -405,7 +405,7 @@ intptr_t CALLBACK RunDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam if (fn.find(' ') != generic_string::npos) { generic_string fn_quotes(fn); - fn_quotes = TEXT("\"") + fn_quotes + TEXT("\""); + fn_quotes = L"\"" + fn_quotes + L"\""; addTextToCombo(fn_quotes.c_str()); } else diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h index 5e365af94..d06698e5e 100644 --- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h +++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h @@ -21,17 +21,17 @@ #define CURRENTWORD_MAXLENGTH 2048 -const TCHAR fullCurrentPath[] = TEXT("FULL_CURRENT_PATH"); -const TCHAR currentDirectory[] = TEXT("CURRENT_DIRECTORY"); -const TCHAR onlyFileName[] = TEXT("FILE_NAME"); -const TCHAR fileNamePart[] = TEXT("NAME_PART"); -const TCHAR fileExtPart[] = TEXT("EXT_PART"); -const TCHAR currentWord[] = TEXT("CURRENT_WORD"); -const TCHAR nppDir[] = TEXT("NPP_DIRECTORY"); -const TCHAR nppFullFilePath[] = TEXT("NPP_FULL_FILE_PATH"); -const TCHAR currentLine[] = TEXT("CURRENT_LINE"); -const TCHAR currentColumn[] = TEXT("CURRENT_COLUMN"); -const TCHAR currentLineStr[] = TEXT("CURRENT_LINESTR"); +const TCHAR fullCurrentPath[] = L"FULL_CURRENT_PATH"; +const TCHAR currentDirectory[] = L"CURRENT_DIRECTORY"; +const TCHAR onlyFileName[] = L"FILE_NAME"; +const TCHAR fileNamePart[] = L"NAME_PART"; +const TCHAR fileExtPart[] = L"EXT_PART"; +const TCHAR currentWord[] = L"CURRENT_WORD"; +const TCHAR nppDir[] = L"NPP_DIRECTORY"; +const TCHAR nppFullFilePath[] = L"NPP_FULL_FILE_PATH"; +const TCHAR currentLine[] = L"CURRENT_LINE"; +const TCHAR currentColumn[] = L"CURRENT_COLUMN"; +const TCHAR currentLineStr[] = L"CURRENT_LINESTR"; int whichVar(TCHAR *str); void expandNppEnvironmentStrs(const TCHAR *strSrc, TCHAR *stringDest, size_t strDestLen, HWND hWnd); diff --git a/PowerEditor/src/WinControls/TabBar/TabBar.cpp b/PowerEditor/src/WinControls/TabBar/TabBar.cpp index 9c105f91f..c6b4e6a6c 100644 --- a/PowerEditor/src/WinControls/TabBar/TabBar.cpp +++ b/PowerEditor/src/WinControls/TabBar/TabBar.cpp @@ -62,7 +62,7 @@ void TabBar::init(HINSTANCE hInst, HWND parent, bool isVertical, bool isMultiLin _hSelf = ::CreateWindowEx( 0, WC_TABCONTROL, - TEXT("Tab"), + L"Tab", style, 0, 0, 0, 0, _hParent, @@ -300,7 +300,7 @@ void TabBarPlus::init(HINSTANCE hInst, HWND parent, bool isVertical, bool isMult int style = WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE | TCS_FOCUSNEVER | TCS_TABS | vertical | multiLine; style |= TCS_OWNERDRAWFIXED; - _hSelf = ::CreateWindowEx(0, WC_TABCONTROL, TEXT("Tab"), style, 0, 0, 0, 0, _hParent, NULL, _hInst, 0); + _hSelf = ::CreateWindowEx(0, WC_TABCONTROL, L"Tab", style, 0, 0, 0, 0, _hParent, NULL, _hInst, 0); if (!_hSelf) { @@ -1145,7 +1145,7 @@ void TabBarPlus::drawItem(DRAWITEMSTRUCT *pDrawItemStruct, bool isDarkMode) int nTab = pDrawItemStruct->itemID; if (nTab < 0) { - ::MessageBox(NULL, TEXT("nTab < 0"), TEXT(""), MB_OK); + ::MessageBox(NULL, TEXT("nTab < 0"), L"", MB_OK); } bool isSelected = (nTab == ::SendMessage(_hSelf, TCM_GETCURSEL, 0, 0)); @@ -1385,7 +1385,7 @@ void TabBarPlus::drawItem(DRAWITEMSTRUCT *pDrawItemStruct, bool isDarkMode) SelectObject(hDC, _hLargeFont); } SIZE charPixel{}; - ::GetTextExtentPoint(hDC, TEXT(" "), 1, &charPixel); + ::GetTextExtentPoint(hDC, L" ", 1, &charPixel); int spaceUnit = charPixel.cx; TEXTMETRIC textMetrics{}; @@ -1462,7 +1462,7 @@ void TabBarPlus::draggingCursor(POINT screenPoint) { TCHAR className[256] = { '\0' }; ::GetClassName(hWin, className, 256); - if ((!lstrcmp(className, TEXT("Scintilla"))) || (!lstrcmp(className, WC_TABCONTROL))) + if ((!lstrcmp(className, L"Scintilla")) || (!lstrcmp(className, WC_TABCONTROL))) { if (::GetKeyState(VK_LCONTROL) & 0x80000000) ::SetCursor(::LoadCursor(_hInst, MAKEINTRESOURCE(IDC_DRAG_PLUS_TAB))); diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp index 7116be220..c3d775133 100644 --- a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp +++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp @@ -67,18 +67,18 @@ ToolbarIconIdUnit toolbarIconIDs[] = { void ToolBar::initTheme(TiXmlDocument *toolIconsDocRoot) { - _toolIcons = toolIconsDocRoot->FirstChild(TEXT("NotepadPlus")); + _toolIcons = toolIconsDocRoot->FirstChild(L"NotepadPlus"); if (_toolIcons) { - _toolIcons = _toolIcons->FirstChild(TEXT("ToolBarIcons")); + _toolIcons = _toolIcons->FirstChild(L"ToolBarIcons"); if (_toolIcons) { generic_string iconFolderDir = NppParameters::getInstance().getUserPath(); - generic_string toolbarIconsRootFolderName = TEXT("toolbarIcons"); + generic_string toolbarIconsRootFolderName = L"toolbarIcons"; pathAppend(iconFolderDir, toolbarIconsRootFolderName); - generic_string folderName = (_toolIcons->ToElement())->Attribute(TEXT("icoFolderName")); + generic_string folderName = (_toolIcons->ToElement())->Attribute(L"icoFolderName"); if (folderName.empty()) - folderName = TEXT("default"); + folderName = L"default"; pathAppend(iconFolderDir, folderName); @@ -317,7 +317,7 @@ void ToolBar::reset(bool create) _hSelf = ::CreateWindowEx( WS_EX_PALETTEWINDOW, TOOLBARCLASSNAME, - TEXT(""), + L"", WS_TOOLBARSTYLE | dwExtraStyle, 0, 0, 0, 0, @@ -509,7 +509,7 @@ void ToolBar::doPopop(POINT chevPoint) else AppendMenu(menu, MF_DISABLED|MF_GRAYED, cmd, text.c_str()); } else - AppendMenu(menu, MF_SEPARATOR, 0, TEXT("")); + AppendMenu(menu, MF_SEPARATOR, 0, L""); ++start; } diff --git a/PowerEditor/src/WinControls/TreeView/TreeView.cpp b/PowerEditor/src/WinControls/TreeView/TreeView.cpp index 5e7224a3b..11538103c 100644 --- a/PowerEditor/src/WinControls/TreeView/TreeView.cpp +++ b/PowerEditor/src/WinControls/TreeView/TreeView.cpp @@ -32,7 +32,7 @@ void TreeView::init(HINSTANCE hInst, HWND parent, int treeViewID) _hSelf = CreateWindowEx(0, WC_TREEVIEW, - TEXT("Tree View"), + L"Tree View", WS_CHILD | WS_BORDER | treeViewStyles, 0, 0, @@ -138,7 +138,7 @@ LPARAM TreeView::getItemParam(HTREEITEM Item2Get) const generic_string TreeView::getItemDisplayName(HTREEITEM Item2Set) const { if (!Item2Set) - return TEXT(""); + return L""; TCHAR textBuffer[MAX_PATH] = { '\0' }; TVITEM tvItem{}; tvItem.hItem = Item2Set; diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp index 698b873f9..4cd229229 100644 --- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp +++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp @@ -451,9 +451,9 @@ intptr_t CALLBACK VerticalFileSwitcher::run_dlgProc(UINT message, WPARAM wParam, Header_GetItem(hwndHD, test->iItem, &hdi); // storing column width data - if (hdi.pszText == pNativeSpeaker->getAttrNameStr(TEXT("Ext."), FS_ROOTNODE, FS_CLMNEXT)) + if (hdi.pszText == pNativeSpeaker->getAttrNameStr(L"Ext.", FS_ROOTNODE, FS_CLMNEXT)) nppParams.getNppGUI()._fileSwitcherExtWidth = hdi.cxy; - else if (hdi.pszText == pNativeSpeaker->getAttrNameStr(TEXT("Path"), FS_ROOTNODE, FS_CLMNPATH)) + else if (hdi.pszText == pNativeSpeaker->getAttrNameStr(L"Path", FS_ROOTNODE, FS_CLMNPATH)) nppParams.getNppGUI()._fileSwitcherPathWidth = hdi.cxy; return TRUE; @@ -533,9 +533,9 @@ void VerticalFileSwitcher::initPopupMenus() NativeLangSpeaker* pNativeSpeaker = NppParameters::getInstance().getNativeLangSpeaker(); NppGUI& nppGUI = NppParameters::getInstance().getNppGUI(); - generic_string extStr = pNativeSpeaker->getAttrNameStr(TEXT("Ext."), FS_ROOTNODE, FS_CLMNEXT); - generic_string pathStr = pNativeSpeaker->getAttrNameStr(TEXT("Path"), FS_ROOTNODE, FS_CLMNPATH); - generic_string groupStr = pNativeSpeaker->getAttrNameStr(TEXT("Group by View"), FS_ROOTNODE, FS_LVGROUPS); + generic_string extStr = pNativeSpeaker->getAttrNameStr(L"Ext.", FS_ROOTNODE, FS_CLMNEXT); + generic_string pathStr = pNativeSpeaker->getAttrNameStr(L"Path", FS_ROOTNODE, FS_CLMNPATH); + generic_string groupStr = pNativeSpeaker->getAttrNameStr(L"Group by View", FS_ROOTNODE, FS_LVGROUPS); _hGlobalMenu = ::CreatePopupMenu(); ::InsertMenu(_hGlobalMenu, CLMNEXT_ID, MF_BYCOMMAND | MF_STRING, CLMNEXT_ID, extStr.c_str()); diff --git a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp index 7b86dafe6..b43e90f90 100644 --- a/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp +++ b/PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp @@ -36,7 +36,7 @@ void VerticalFileSwitcherListView::init(HINSTANCE hInst, HWND parent, HIMAGELIST | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | LVS_ALIGNTOP; _hSelf = ::CreateWindow(WC_LISTVIEW, - TEXT(""), + L"", WS_CHILD | WS_BORDER | listViewStyles, 0, 0, @@ -109,16 +109,16 @@ void VerticalFileSwitcherListView::initList() nameWidth -= nppParams._dpiManager.scaleX(nppParams.getNppGUI()._fileSwitcherPathWidth); //add columns - generic_string nameStr = pNativeSpeaker->getAttrNameStr(TEXT("Name"), FS_ROOTNODE, FS_CLMNNAME); + generic_string nameStr = pNativeSpeaker->getAttrNameStr(L"Name", FS_ROOTNODE, FS_CLMNNAME); insertColumn(nameStr.c_str(), nameWidth, ++colIndex); if (isExtColumn) { - generic_string extStr = pNativeSpeaker->getAttrNameStr(TEXT("Ext."), FS_ROOTNODE, FS_CLMNEXT); + generic_string extStr = pNativeSpeaker->getAttrNameStr(L"Ext.", FS_ROOTNODE, FS_CLMNEXT); insertColumn(extStr.c_str(), nppParams._dpiManager.scaleX(nppParams.getNppGUI()._fileSwitcherExtWidth), ++colIndex); //2nd column } if (isPathColumn) { - generic_string pathStr = pNativeSpeaker->getAttrNameStr(TEXT("Path"), FS_ROOTNODE, FS_CLMNPATH); + generic_string pathStr = pNativeSpeaker->getAttrNameStr(L"Path", FS_ROOTNODE, FS_CLMNPATH); insertColumn(pathStr.c_str(), nppParams._dpiManager.scaleX(nppParams.getNppGUI()._fileSwitcherPathWidth), ++colIndex); //2nd column if .ext is off } @@ -288,7 +288,7 @@ generic_string VerticalFileSwitcherListView::getFullFilePath(size_t i) const { size_t nbItem = ListView_GetItemCount(_hSelf); if (i > nbItem) - return TEXT(""); + return L""; LVITEM item{}; item.mask = LVIF_PARAM; diff --git a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp index d48700985..b5cba852d 100644 --- a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp +++ b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp @@ -178,7 +178,7 @@ struct BufferEquivalent s1 = lang1->getLangName(); } else - s1 = TEXT(""); + s1 = L""; Lang *lang2 = nppParameters.getLangFromID(b2->getLangType()); if (lang2) @@ -186,7 +186,7 @@ struct BufferEquivalent s2 = lang2->getLangName(); } else - s2 = TEXT(""); + s2 = L""; int result = _strequiv(s1, s2); @@ -398,7 +398,7 @@ intptr_t CALLBACK WindowsDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP int len = lstrlen(fullName)-lstrlen(fileName); if (!len) { len = 1; - fullName = TEXT(""); + fullName = L""; } text.assign(fullName, len); } @@ -601,23 +601,23 @@ BOOL WindowsDlg::onInitDialog() generic_string columnText; NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); - columnText = TEXT("⇵ ") + pNativeSpeaker->getAttrNameStr(TEXT("Name"), WD_ROOTNODE, WD_CLMNNAME); + columnText = TEXT("⇵ ") + pNativeSpeaker->getAttrNameStr(L"Name", WD_ROOTNODE, WD_CLMNNAME); lvColumn.pszText = const_cast(columnText.c_str()); lvColumn.cx = width / 4; SendMessage(_hList, LVM_INSERTCOLUMN, 0, LPARAM(&lvColumn)); - columnText = TEXT("⇵ ") + pNativeSpeaker->getAttrNameStr(TEXT("Path"), WD_ROOTNODE, WD_CLMNPATH); + columnText = TEXT("⇵ ") + pNativeSpeaker->getAttrNameStr(L"Path", WD_ROOTNODE, WD_CLMNPATH); lvColumn.pszText = const_cast(columnText.c_str()); lvColumn.cx = 300; SendMessage(_hList, LVM_INSERTCOLUMN, 1, LPARAM(&lvColumn)); lvColumn.fmt = LVCFMT_CENTER; - columnText = TEXT("⇵ ") + pNativeSpeaker->getAttrNameStr(TEXT("Type"), WD_ROOTNODE, WD_CLMNTYPE); + columnText = TEXT("⇵ ") + pNativeSpeaker->getAttrNameStr(L"Type", WD_ROOTNODE, WD_CLMNTYPE); lvColumn.pszText = const_cast(columnText.c_str()); lvColumn.cx = 100; SendMessage(_hList, LVM_INSERTCOLUMN, 2, LPARAM(&lvColumn)); - columnText = TEXT("⇵ ") + pNativeSpeaker->getAttrNameStr(TEXT("Size"), WD_ROOTNODE, WD_CLMNSIZE); + columnText = TEXT("⇵ ") + pNativeSpeaker->getAttrNameStr(L"Size", WD_ROOTNODE, WD_CLMNSIZE); lvColumn.pszText = const_cast(columnText.c_str()); lvColumn.cx = 100; SendMessage(_hList, LVM_INSERTCOLUMN, 3, LPARAM(&lvColumn)); @@ -647,7 +647,7 @@ void WindowsDlg::updateColumnNames() generic_string columnText; NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); - columnText = pNativeSpeaker->getAttrNameStr(TEXT("Name"), WD_ROOTNODE, WD_CLMNNAME); + columnText = pNativeSpeaker->getAttrNameStr(L"Name", WD_ROOTNODE, WD_CLMNNAME); if (_currentColumn != 0) { columnText = TEXT("⇵ ") + columnText; @@ -664,7 +664,7 @@ void WindowsDlg::updateColumnNames() lvColumn.cx = static_cast(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 0, 0)); SendMessage(_hList, LVM_SETCOLUMN, 0, LPARAM(&lvColumn)); - columnText = pNativeSpeaker->getAttrNameStr(TEXT("Path"), WD_ROOTNODE, WD_CLMNPATH); + columnText = pNativeSpeaker->getAttrNameStr(L"Path", WD_ROOTNODE, WD_CLMNPATH); if (_currentColumn != 1) { columnText = TEXT("⇵ ") + columnText; @@ -682,7 +682,7 @@ void WindowsDlg::updateColumnNames() SendMessage(_hList, LVM_SETCOLUMN, 1, LPARAM(&lvColumn)); lvColumn.fmt = LVCFMT_CENTER; - columnText = pNativeSpeaker->getAttrNameStr(TEXT("Type"), WD_ROOTNODE, WD_CLMNTYPE); + columnText = pNativeSpeaker->getAttrNameStr(L"Type", WD_ROOTNODE, WD_CLMNTYPE); if (_currentColumn != 2) { columnText = TEXT("⇵ ") + columnText; @@ -699,7 +699,7 @@ void WindowsDlg::updateColumnNames() lvColumn.cx = static_cast(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 2, 0)); SendMessage(_hList, LVM_SETCOLUMN, 2, LPARAM(&lvColumn)); - columnText = pNativeSpeaker->getAttrNameStr(TEXT("Size"), WD_ROOTNODE, WD_CLMNSIZE); + columnText = pNativeSpeaker->getAttrNameStr(L"Size", WD_ROOTNODE, WD_CLMNSIZE); if (_currentColumn != 3) { columnText = TEXT("⇵ ") + columnText; @@ -937,10 +937,10 @@ void WindowsDlg::doCount() { NativeLangSpeaker* pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); - generic_string msg = pNativeSpeaker->getAttrNameStr(TEXT("Windows"), "Dialog", "Window", "title"); - msg += TEXT(" - "); - msg += pNativeSpeaker->getAttrNameStr(TEXT("Total documents: "), WD_ROOTNODE, WD_NBDOCSTOTAL); - msg += TEXT(" "); + generic_string msg = pNativeSpeaker->getAttrNameStr(L"Windows", "Dialog", "Window", "title"); + msg += L" - "; + msg += pNativeSpeaker->getAttrNameStr(L"Total documents: ", WD_ROOTNODE, WD_NBDOCSTOTAL); + msg += L" "; msg += to_wstring(_idxMap.size()); SetWindowText(_hSelf,msg.c_str()); } diff --git a/PowerEditor/src/clipboardFormats.h b/PowerEditor/src/clipboardFormats.h index 1113fccc6..1e6f08b0e 100644 --- a/PowerEditor/src/clipboardFormats.h +++ b/PowerEditor/src/clipboardFormats.h @@ -18,8 +18,8 @@ #ifndef CLIPBOARDFORMATS_H #define CLIPBOARDFORMATS_H -#define CF_HTML TEXT("HTML Format") -#define CF_RTF TEXT("Rich Text Format") -#define CF_NPPTEXTLEN TEXT("Notepad++ Binary Length") +#define CF_HTML L"HTML Format" +#define CF_RTF L"Rich Text Format" +#define CF_NPPTEXTLEN L"Notepad++ Binary Length" #endif //CLIPBOARDFORMATS_H diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h index 67c35a649..e72430e68 100644 --- a/PowerEditor/src/localizationString.h +++ b/PowerEditor/src/localizationString.h @@ -17,98 +17,98 @@ LocalizationSwitcher::LocalizationDefinition localizationDefs[] = { - {TEXT("English"), TEXT("english.xml")}, - {TEXT("English (customizable)"), TEXT("english_customizable.xml")}, - {TEXT("Français"), TEXT("french.xml")}, - {TEXT("台灣繁體"), TEXT("taiwaneseMandarin.xml")}, - {TEXT("中文简体"), TEXT("chineseSimplified.xml")}, - {TEXT("한국어"), TEXT("korean.xml")}, - {TEXT("日本語"), TEXT("japanese.xml")}, - {TEXT("Deutsch"), TEXT("german.xml")}, - {TEXT("Español"), TEXT("spanish.xml")}, - {TEXT("Italiano"), TEXT("italian.xml")}, - {TEXT("Português"), TEXT("portuguese.xml")}, - {TEXT("Português brasileiro"), TEXT("brazilian_portuguese.xml")}, - {TEXT("Nederlands"), TEXT("dutch.xml")}, - {TEXT("Русский"), TEXT("russian.xml")}, - {TEXT("Polski"), TEXT("polish.xml")}, - {TEXT("Català"), TEXT("catalan.xml")}, - {TEXT("Česky"), TEXT("czech.xml")}, - {TEXT("Magyar"), TEXT("hungarian.xml")}, - {TEXT("Română"), TEXT("romanian.xml")}, - {TEXT("Türkçe"), TEXT("turkish.xml")}, - {TEXT("فارسی"), TEXT("farsi.xml")}, - {TEXT("Українська"), TEXT("ukrainian.xml")}, - {TEXT("עברית"), TEXT("hebrew.xml")}, - {TEXT("Nynorsk"), TEXT("nynorsk.xml")}, - {TEXT("Norsk"), TEXT("norwegian.xml")}, - {TEXT("Occitan"), TEXT("occitan.xml")}, - {TEXT("ไทย"), TEXT("thai.xml")}, - {TEXT("Furlan"), TEXT("friulian.xml")}, - {TEXT("العربية"), TEXT("arabic.xml")}, - {TEXT("Suomi"), TEXT("finnish.xml")}, - {TEXT("Lietuvių"), TEXT("lithuanian.xml")}, - {TEXT("Ελληνικά"), TEXT("greek.xml")}, - {TEXT("Svenska"), TEXT("swedish.xml")}, - {TEXT("Galego"), TEXT("galician.xml")}, - {TEXT("Slovenščina"), TEXT("slovenian.xml")}, - {TEXT("Slovenčina"), TEXT("slovak.xml")}, - {TEXT("Dansk"), TEXT("danish.xml")}, - {TEXT("Estremeñu"), TEXT("extremaduran.xml")}, - {TEXT("Žemaitiu ruoda"), TEXT("samogitian.xml")}, - {TEXT("Български"), TEXT("bulgarian.xml")}, - {TEXT("Bahasa Indonesia"), TEXT("indonesian.xml")}, - {TEXT("Gjuha shqipe"), TEXT("albanian.xml")}, - {TEXT("Hrvatski"), TEXT("croatian.xml")}, - {TEXT("ქართული ენა"), TEXT("georgian.xml")}, - {TEXT("Euskara"), TEXT("basque.xml")}, - {TEXT("Español argentina"), TEXT("spanish_ar.xml")}, - {TEXT("Беларуская мова"), TEXT("belarusian.xml")}, - {TEXT("Srpski"), TEXT("serbian.xml")}, - {TEXT("Cрпски"), TEXT("serbianCyrillic.xml")}, - {TEXT("Bahasa Melayu"), TEXT("malay.xml")}, - {TEXT("Lëtzebuergesch"), TEXT("luxembourgish.xml")}, - {TEXT("Tagalog"), TEXT("tagalog.xml")}, - {TEXT("Afrikaans"), TEXT("afrikaans.xml")}, - {TEXT("Қазақша"), TEXT("kazakh.xml")}, - {TEXT("O‘zbekcha"), TEXT("uzbek.xml")}, - {TEXT("Ўзбекча"), TEXT("uzbekCyrillic.xml")}, - {TEXT("Кыргыз тили"), TEXT("kyrgyz.xml")}, - {TEXT("Македонски јазик"), TEXT("macedonian.xml")}, - {TEXT("latviešu valoda"), TEXT("latvian.xml")}, - {TEXT("தமிழ்"), TEXT("tamil.xml")}, - {TEXT("Azərbaycan dili"), TEXT("azerbaijani.xml")}, - {TEXT("Bosanski"), TEXT("bosnian.xml")}, - {TEXT("Esperanto"), TEXT("esperanto.xml")}, - {TEXT("Zeneize"), TEXT("ligurian.xml")}, - {TEXT("हिन्दी"), TEXT("hindi.xml")}, - {TEXT("Sardu"), TEXT("sardinian.xml")}, - {TEXT("ئۇيغۇرچە"), TEXT("uyghur.xml")}, - {TEXT("తెలుగు"), TEXT("telugu.xml")}, - {TEXT("aragonés"), TEXT("aragonese.xml")}, - {TEXT("বাংলা"), TEXT("bengali.xml")}, - {TEXT("සිංහල"), TEXT("sinhala.xml")}, - {TEXT("Taqbaylit"), TEXT("kabyle.xml")}, - {TEXT("मराठी"), TEXT("marathi.xml")}, - {TEXT("tiếng Việt"), TEXT("vietnamese.xml")}, - {TEXT("Aranés"), TEXT("aranese.xml")}, - {TEXT("ગુજરાતી"), TEXT("gujarati.xml")}, - {TEXT("Монгол хэл"), TEXT("mongolian.xml")}, - {TEXT("اُردُو‎"), TEXT("urdu.xml")}, - {TEXT("ಕನ್ನಡ‎"), TEXT("kannada.xml")}, - {TEXT("Cymraeg"), TEXT("welsh.xml")}, - {TEXT("eesti keel"), TEXT("estonian.xml")}, - {TEXT("Тоҷик"), TEXT("tajikCyrillic.xml")}, - {TEXT("татарча"), TEXT("tatar.xml")}, - {TEXT("ਪੰਜਾਬੀ"), TEXT("punjabi.xml")}, - {TEXT("Corsu"), TEXT("corsican.xml")}, - {TEXT("Brezhoneg"), TEXT("breton.xml")}, - {TEXT("کوردی‬"), TEXT("kurdish.xml")}, - {TEXT("Pig latin"), TEXT("piglatin.xml")}, - {TEXT("Zulu"), TEXT("zulu.xml")}, - {TEXT("Vèneto"), TEXT("venetian.xml")}, - {TEXT("Gaeilge"), TEXT("irish.xml")}, - {TEXT("नेपाली"), TEXT("nepali.xml")}, - {TEXT("香港繁體"), TEXT("hongKongCantonese.xml")}, - {TEXT("Аԥсуа бызшәа"), TEXT("abkhazian.xml")} + {L"English", L"english.xml"}, + {L"English (customizable)", L"english_customizable.xml"}, + {L"Français", L"french.xml"}, + {L"台灣繁體", L"taiwaneseMandarin.xml"}, + {L"中文简体", L"chineseSimplified.xml"}, + {L"한국어", L"korean.xml"}, + {L"日本語", L"japanese.xml"}, + {L"Deutsch", L"german.xml"}, + {L"Español", L"spanish.xml"}, + {L"Italiano", L"italian.xml"}, + {L"Português", L"portuguese.xml"}, + {L"Português brasileiro", L"brazilian_portuguese.xml"}, + {L"Nederlands", L"dutch.xml"}, + {L"Русский", L"russian.xml"}, + {L"Polski", L"polish.xml"}, + {L"Català", L"catalan.xml"}, + {L"Česky", L"czech.xml"}, + {L"Magyar", L"hungarian.xml"}, + {L"Română", L"romanian.xml"}, + {L"Türkçe", L"turkish.xml"}, + {L"فارسی", L"farsi.xml"}, + {L"Українська", L"ukrainian.xml"}, + {L"עברית", L"hebrew.xml"}, + {L"Nynorsk", L"nynorsk.xml"}, + {L"Norsk", L"norwegian.xml"}, + {L"Occitan", L"occitan.xml"}, + {L"ไทย", L"thai.xml"}, + {L"Furlan", L"friulian.xml"}, + {L"العربية", L"arabic.xml"}, + {L"Suomi", L"finnish.xml"}, + {L"Lietuvių", L"lithuanian.xml"}, + {L"Ελληνικά", L"greek.xml"}, + {L"Svenska", L"swedish.xml"}, + {L"Galego", L"galician.xml"}, + {L"Slovenščina", L"slovenian.xml"}, + {L"Slovenčina", L"slovak.xml"}, + {L"Dansk", L"danish.xml"}, + {L"Estremeñu", L"extremaduran.xml"}, + {L"Žemaitiu ruoda", L"samogitian.xml"}, + {L"Български", L"bulgarian.xml"}, + {L"Bahasa Indonesia", L"indonesian.xml"}, + {L"Gjuha shqipe", L"albanian.xml"}, + {L"Hrvatski", L"croatian.xml"}, + {L"ქართული ენა", L"georgian.xml"}, + {L"Euskara", L"basque.xml"}, + {L"Español argentina", L"spanish_ar.xml"}, + {L"Беларуская мова", L"belarusian.xml"}, + {L"Srpski", L"serbian.xml"}, + {L"Cрпски", L"serbianCyrillic.xml"}, + {L"Bahasa Melayu", L"malay.xml"}, + {L"Lëtzebuergesch", L"luxembourgish.xml"}, + {L"Tagalog", L"tagalog.xml"}, + {L"Afrikaans", L"afrikaans.xml"}, + {L"Қазақша", L"kazakh.xml"}, + {L"O‘zbekcha", L"uzbek.xml"}, + {L"Ўзбекча", L"uzbekCyrillic.xml"}, + {L"Кыргыз тили", L"kyrgyz.xml"}, + {L"Македонски јазик", L"macedonian.xml"}, + {L"latviešu valoda", L"latvian.xml"}, + {L"தமிழ்", L"tamil.xml"}, + {L"Azərbaycan dili", L"azerbaijani.xml"}, + {L"Bosanski", L"bosnian.xml"}, + {L"Esperanto", L"esperanto.xml"}, + {L"Zeneize", L"ligurian.xml"}, + {L"हिन्दी", L"hindi.xml"}, + {L"Sardu", L"sardinian.xml"}, + {L"ئۇيغۇرچە", L"uyghur.xml"}, + {L"తెలుగు", L"telugu.xml"}, + {L"aragonés", L"aragonese.xml"}, + {L"বাংলা", L"bengali.xml"}, + {L"සිංහල", L"sinhala.xml"}, + {L"Taqbaylit", L"kabyle.xml"}, + {L"मराठी", L"marathi.xml"}, + {L"tiếng Việt", L"vietnamese.xml"}, + {L"Aranés", L"aranese.xml"}, + {L"ગુજરાતી", L"gujarati.xml"}, + {L"Монгол хэл", L"mongolian.xml"}, + {L"اُردُو‎", L"urdu.xml"}, + {L"ಕನ್ನಡ‎", L"kannada.xml"}, + {L"Cymraeg", L"welsh.xml"}, + {L"eesti keel", L"estonian.xml"}, + {L"Тоҷик", L"tajikCyrillic.xml"}, + {L"татарча", L"tatar.xml"}, + {L"ਪੰਜਾਬੀ", L"punjabi.xml"}, + {L"Corsu", L"corsican.xml"}, + {L"Brezhoneg", L"breton.xml"}, + {L"کوردی‬", L"kurdish.xml"}, + {L"Pig latin", L"piglatin.xml"}, + {L"Zulu", L"zulu.xml"}, + {L"Vèneto", L"venetian.xml"}, + {L"Gaeilge", L"irish.xml"}, + {L"नेपाली", L"nepali.xml"}, + {L"香港繁體", L"hongKongCantonese.xml"}, + {L"Аԥсуа бызшәа", L"abkhazian.xml"} };