github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use L"" instead of TEXT("") - Part 1

pull/15457/head
Don Ho 2024-07-18 05:26:20 +02:00
parent ea5e36a5be
commit 3bca7bf278
23 changed files with 536 additions and 534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
PowerEditor/src/MISC/Common/verifySignedfile.cpp
View File

@ -36,11 +36,11 @@ SecurityMode SecurityGuard::_securityMode = sm_certif;
SecurityGuard::SecurityGuard() SecurityGuard::SecurityGuard()
{ {
_gupSha256.push_back(TEXT("4c8191f511c2ad67148ef809b40c1108aaa074130547157c335a959404d8d6f6")); // v5.1 32 bit (signed) _gupSha256.push_back(L"4c8191f511c2ad67148ef809b40c1108aaa074130547157c335a959404d8d6f6"); // v5.1 32 bit (signed)
_gupSha256.push_back(TEXT("268a65829e86d5c3d324eea79b51e59f0a7d07c69d3ba0f700c9cb3aa772566f")); // v5.1 64 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(L"a4a7e57d605f29b294378d0d94fc867b9febd6a1cc63f1bb69bcb7609dc25f2c"); // v1.0.8 32 bit (unsigned)
_pluginListSha256.push_back(TEXT("1c404fd3578273f5ecde585af82179ff3b63c635fb4fa24be21ebde708e403e4")); // v1.0.8 64 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) 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) if (i == sha2hashStr)
{ {
//::MessageBox(NULL, filePath.c_str(), TEXT("OK"), MB_OK); //::MessageBox(NULL, filePath.c_str(), L"OK", MB_OK);
return true; return true;
} }
} }
//::MessageBox(NULL, filePath.c_str(), TEXT("KO"), MB_OK); //::MessageBox(NULL, filePath.c_str(), L"KO", MB_OK);
return false; return false;
} }
@ -113,7 +113,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath)
{ {
string dmsg("VerifyLibrary: "); string dmsg("VerifyLibrary: ");
dmsg += ws2s(filepath); 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; winTEXTrust_data.fdwRevocationChecks = WTD_REVOKE_NONE;
if (doLogCertifError) 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 else
{ {
@ -159,7 +159,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath)
winTEXTrust_data.fdwRevocationChecks = WTD_REVOKE_NONE; winTEXTrust_data.fdwRevocationChecks = WTD_REVOKE_NONE;
if (doLogCertifError) 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 (vtrust)
{ {
if (doLogCertifError) if (doLogCertifError)
writeLog(TEXT("c:\\tmp\\certifError.log"), "VerifyLibrary: trust verification failed"); writeLog(L"c:\\tmp\\certifError.log", "VerifyLibrary: trust verification failed");
return false; return false;
} }
@ -184,7 +184,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath)
if (t2) if (t2)
{ {
if (doLogCertifError) 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; return false;
} }
@ -277,7 +277,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath)
key_id_hex = ss.str(); key_id_hex = ss.str();
if (doLogCertifError) 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 // Getting the display name
auto sze = ::CertGetNameString(context, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, NULL, 0); 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; string msg = s;
msg += " - VerifyLibrary: error while getting certificate informations"; 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; status = false;
} }
catch (...) { catch (...) {
// Unknown error // Unknown error
if (doLogCertifError) 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; status = false;
} }
@ -320,7 +320,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath)
status = false; status = false;
if (doLogCertifError) 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)) if (status && (_signer_subject != subject))
@ -328,7 +328,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath)
status = false; status = false;
if (doLogCertifError) 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)) if (status && (_signer_key_id != key_id_hex))
@ -336,7 +336,7 @@ bool SecurityGuard::verifySignedLibrary(const std::wstring& filepath)
status = false; status = false;
if (doLogCertifError) 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. // Clean up.

6
PowerEditor/src/MISC/Common/verifySignedfile.h
View File

@ -66,9 +66,9 @@ private:
bool checkSha256(const std::wstring& filePath, NppModule module2check); bool checkSha256(const std::wstring& filePath, NppModule module2check);
// Code signing certificate // Code signing certificate
std::wstring _signer_display_name = TEXT("Notepad++"); std::wstring _signer_display_name = L"Notepad++";
std::wstring _signer_subject = TEXT("C=FR, S=Ile-de-France, L=Saint Cloud, O=\"Notepad++\", CN=\"Notepad++\""); std::wstring _signer_subject = L"C=FR, S=Ile-de-France, L=Saint Cloud, O=\"Notepad++\", CN=\"Notepad++\"";
std::wstring _signer_key_id = TEXT("E687332916D6B681FE28C5EF423CEE259D3953B9"); std::wstring _signer_key_id = L"E687332916D6B681FE28C5EF423CEE259D3953B9";
bool _doCheckRevocation = false; bool _doCheckRevocation = false;
bool _doCheckChainOfTrust = false; bool _doCheckChainOfTrust = false;

16
PowerEditor/src/MISC/Exception/MiniDumper.cpp
View File

@ -21,7 +21,7 @@
#include <shlwapi.h> #include <shlwapi.h>
#include "MiniDumper.h" #include "MiniDumper.h"
LPCTSTR msgTitle = TEXT("Notepad++ crash analysis"); LPCTSTR msgTitle = L"Notepad++ crash analysis";
MiniDumper::MiniDumper() MiniDumper::MiniDumper()
{ {
@ -34,7 +34,7 @@ bool MiniDumper::writeDump(EXCEPTION_POINTERS * pExceptionInfo)
LPCTSTR szResult = NULL; LPCTSTR szResult = NULL;
bool retval = false; 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) if (hDll)
{ {
@ -43,7 +43,7 @@ bool MiniDumper::writeDump(EXCEPTION_POINTERS * pExceptionInfo)
{ {
::GetModuleFileName(NULL, szDumpPath, MAX_PATH); ::GetModuleFileName(NULL, szDumpPath, MAX_PATH);
::PathRemoveFileSpec(szDumpPath); ::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 // 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); 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 ); BOOL bOK = pDump( GetCurrentProcess(), GetCurrentProcessId(), hFile, MiniDumpNormal, &ExInfo, NULL, NULL );
if (bOK) if (bOK)
{ {
wsprintf( szScratch, TEXT("Saved dump file to '%s'"), szDumpPath ); wsprintf( szScratch, L"Saved dump file to '%s'", szDumpPath );
szResult = szScratch; szResult = szScratch;
retval = true; retval = true;
} }
else 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; szResult = szScratch;
} }
::CloseHandle(hFile); ::CloseHandle(hFile);
} }
else 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; szResult = szScratch;
} }
} }
} }
else 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); ::FreeLibrary(hDll);
} }
else 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) if (szResult)

4
PowerEditor/src/MISC/Process/Processus.cpp
View File

@ -21,7 +21,7 @@
void Process::run(bool isElevationRequired) const 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); ::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.cbSize = sizeof(SHELLEXECUTEINFO);
ShExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS; ShExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS;
ShExecInfo.hwnd = NULL; ShExecInfo.hwnd = NULL;
ShExecInfo.lpVerb = isElevationRequired ? TEXT("runas") : TEXT("open"); ShExecInfo.lpVerb = isElevationRequired ? L"runas" : L"open";
ShExecInfo.lpFile = _command.c_str(); ShExecInfo.lpFile = _command.c_str();
ShExecInfo.lpParameters = _args.c_str(); ShExecInfo.lpParameters = _args.c_str();
ShExecInfo.lpDirectory = _curDir.c_str(); ShExecInfo.lpDirectory = _curDir.c_str();

8
PowerEditor/src/MISC/Process/Processus.h
View File

@ -24,15 +24,15 @@ enum progType {WIN32_PROG, CONSOLE_PROG};
class Process class Process
{ {
public: 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){} :_command(cmd), _args(args), _curDir(cDir){}
void run(bool isElevationRequired = false) const; void run(bool isElevationRequired = false) const;
unsigned long runSync(bool isElevationRequired = false) const; unsigned long runSync(bool isElevationRequired = false) const;
protected: protected:
generic_string _command; std::wstring _command;
generic_string _args; std::wstring _args;
generic_string _curDir; std::wstring _curDir;
}; };

84
PowerEditor/src/MISC/RegExt/regExtDlg.cpp
View File

@ -20,9 +20,9 @@
const TCHAR* nppName = TEXT("Notepad++_file"); const TCHAR* nppName = L"Notepad++_file";
const TCHAR* nppBackup = TEXT("Notepad++_backup"); const TCHAR* nppBackup = L"Notepad++_backup";
const TCHAR* nppDoc = TEXT("Notepad++ Document"); const TCHAR* nppDoc = L"Notepad++ Document";
const int nbSupportedLang = 10; const int nbSupportedLang = 10;
const int nbExtMax = 28; const int nbExtMax = 28;
@ -31,41 +31,41 @@ const int extNameMax = 18;
const TCHAR defExtArray[nbSupportedLang][nbExtMax][extNameMax] = const TCHAR defExtArray[nbSupportedLang][nbExtMax][extNameMax] =
{ {
{TEXT("Notepad"), {L"Notepad",
TEXT(".txt"), TEXT(".log") L".txt", L".log"
}, },
{TEXT("ms ini/inf"), {TEXT("ms ini/inf"),
TEXT(".ini"), TEXT(".inf") L".ini", L".inf"
}, },
{TEXT("c, c++, objc"), {L"c, c++, objc",
TEXT(".h"), TEXT(".hh"), TEXT(".hpp"), TEXT(".hxx"), TEXT(".c"), TEXT(".cpp"), TEXT(".cxx"), TEXT(".cc"), L".h", L".hh", L".hpp", L".hxx", L".c", L".cpp", L".cxx", L".cc",
TEXT(".m"), TEXT(".mm"), L".m", L".mm",
TEXT(".vcxproj"), TEXT(".vcproj"), TEXT(".props"), TEXT(".vsprops"), TEXT(".manifest") L".vcxproj", L".vcproj", L".props", L".vsprops", L".manifest"
}, },
{TEXT("java, c#, pascal"), {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"), {L"web script",
TEXT(".html"), TEXT(".htm"), TEXT(".shtml"), TEXT(".shtm"), TEXT(".hta"), L".html", L".htm", L".shtml", L".shtm", L".hta",
TEXT(".asp"), TEXT(".aspx"), L".asp", L".aspx",
TEXT(".css"), TEXT(".js"), TEXT(".json"), TEXT(".mjs"), TEXT(".jsm"), TEXT(".jsp"), L".css", L".js", L".json", L".mjs", L".jsm", L".jsp",
TEXT(".php"), TEXT(".php3"), TEXT(".php4"), TEXT(".php5"), TEXT(".phps"), TEXT(".phpt"), TEXT(".phtml"), L".php", L".php3", L".php4", L".php5", L".phps", L".phpt", L".phtml",
TEXT(".xml"), TEXT(".xhtml"), TEXT(".xht"), TEXT(".xul"), TEXT(".kml"), TEXT(".xaml"), TEXT(".xsml") L".xml", L".xhtml", L".xht", L".xul", L".kml", L".xaml", L".xsml"
}, },
{TEXT("public script"), {L"public script",
TEXT(".sh"), TEXT(".bsh"), TEXT(".bash"), TEXT(".bat"), TEXT(".cmd"), TEXT(".nsi"), L".sh", L".bsh", L".bash", L".bat", L".cmd", L".nsi",
TEXT(".nsh"), TEXT(".lua"), TEXT(".pl"), TEXT(".pm"), TEXT(".py") L".nsh", L".lua", L".pl", L".pm", L".py"
}, },
{TEXT("property script"), {L"property script",
TEXT(".rc"), TEXT(".as"), TEXT(".mx"), TEXT(".vb"), TEXT(".vbs") L".rc", L".as", L".mx", L".vb", L".vbs"
}, },
{TEXT("fortran, TeX, SQL"), {L"fortran, TeX, SQL",
TEXT(".f"), TEXT(".for"), TEXT(".f90"), TEXT(".f95"), TEXT(".f2k"), TEXT(".tex"), TEXT(".sql") L".f", L".for", L".f90", L".f95", L".f2k", L".tex", L".sql"
}, },
{TEXT("misc"), {L"misc",
TEXT(".nfo"), TEXT(".mak") L".nfo", L".mak"
}, },
{TEXT("customize")} {L"customize"}
}; };
void RegExtDlg::doDialog(bool isRTL) void RegExtDlg::doDialog(bool isRTL)
@ -171,7 +171,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa
{ {
writeNppPath(); writeNppPath();
TCHAR ext2Add[extNameMax] = TEXT(""); TCHAR ext2Add[extNameMax] = L"";
if (!_isCustomize) if (!_isCustomize)
{ {
auto index2Add = ::SendDlgItemMessage(_hSelf, IDC_REGEXT_LANGEXT_LIST, LB_GETCURSEL, 0, 0); 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) if (i != LB_ERR)
return TRUE; return TRUE;
addExt(ext2Add); addExt(ext2Add);
::SendDlgItemMessage(_hSelf, IDC_CUSTOMEXT_EDIT, WM_SETTEXT, 0, reinterpret_cast<LPARAM>(TEXT(""))); ::SendDlgItemMessage(_hSelf, IDC_CUSTOMEXT_EDIT, WM_SETTEXT, 0, reinterpret_cast<LPARAM>(L""));
} }
::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_ADDSTRING, 0, reinterpret_cast<LPARAM>(ext2Add)); ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_ADDSTRING, 0, reinterpret_cast<LPARAM>(ext2Add));
::EnableWindow(::GetDlgItem(_hSelf, IDC_ADDFROMLANGEXT_BUTTON), false); ::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 : 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 index2Sup = ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_GETCURSEL, 0, 0);
auto lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_GETTEXTLEN, index2Sup, 0); auto lbTextLen = ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_GETTEXTLEN, index2Sup, 0);
if (lbTextLen > extNameMax - 1) 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) if (HIWORD(wParam) == EN_CHANGE)
{ {
TCHAR text[extNameMax] = TEXT(""); TCHAR text[extNameMax] = L"";
::SendDlgItemMessage(_hSelf, IDC_CUSTOMEXT_EDIT, WM_GETTEXT, extNameMax, reinterpret_cast<LPARAM>(text)); ::SendDlgItemMessage(_hSelf, IDC_CUSTOMEXT_EDIT, WM_GETTEXT, extNameMax, reinterpret_cast<LPARAM>(text));
if ((lstrlen(text) == 1) && (text[0] != '.')) 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) 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<LPARAM>(defExtArray[i][j])); auto index = ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_FINDSTRINGEXACT, 0, reinterpret_cast<LPARAM>(defExtArray[i][j]));
if (index == -1) if (index == -1)
@ -337,7 +337,7 @@ void RegExtDlg::getRegisteredExts()
HKEY hKey2Check; HKEY hKey2Check;
extNameActualLen = extNameLen; extNameActualLen = extNameLen;
::RegOpenKeyEx(HKEY_CLASSES_ROOT, extName, 0, KEY_ALL_ACCESS, &hKey2Check); ::RegOpenKeyEx(HKEY_CLASSES_ROOT, extName, 0, KEY_ALL_ACCESS, &hKey2Check);
::RegQueryValueEx(hKey2Check, TEXT(""), nullptr, &valType, reinterpret_cast<LPBYTE>(valData), &valDataLen); ::RegQueryValueEx(hKey2Check, L"", nullptr, &valType, reinterpret_cast<LPBYTE>(valData), &valDataLen);
if ((valType == REG_SZ) && (!lstrcmp(valData, nppName))) if ((valType == REG_SZ) && (!lstrcmp(valData, nppName)))
::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_ADDSTRING, 0, reinterpret_cast<LPARAM>(extName)); ::SendDlgItemMessage(_hSelf, IDC_REGEXT_REGISTEREDEXTS_LIST, LB_ADDSTRING, 0, reinterpret_cast<LPARAM>(extName));
@ -369,7 +369,7 @@ void RegExtDlg::addExt(TCHAR *ext)
if (dwDisp == REG_OPENED_EXISTING_KEY) if (dwDisp == REG_OPENED_EXISTING_KEY)
{ {
int res = ::RegQueryValueEx(hKey, TEXT(""), nullptr, nullptr, reinterpret_cast<LPBYTE>(valData), &valDataLen); int res = ::RegQueryValueEx(hKey, L"", nullptr, nullptr, reinterpret_cast<LPBYTE>(valData), &valDataLen);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
::RegSetValueEx(hKey, nppBackup, 0, REG_SZ, reinterpret_cast<LPBYTE>(valData), valDataLen); ::RegSetValueEx(hKey, nppBackup, 0, REG_SZ, reinterpret_cast<LPBYTE>(valData), valDataLen);
} }
@ -390,7 +390,7 @@ bool RegExtDlg::deleteExts(const TCHAR *ext2Delete)
if ((nbValue <= 1) && (!nbSubkey)) if ((nbValue <= 1) && (!nbSubkey))
{ {
TCHAR subKey[32] = TEXT("\\"); TCHAR subKey[32] = L"\\";
wcscat_s(subKey, ext2Delete); wcscat_s(subKey, ext2Delete);
::RegDeleteKey(HKEY_CLASSES_ROOT, subKey); ::RegDeleteKey(HKEY_CLASSES_ROOT, subKey);
} }
@ -419,8 +419,8 @@ void RegExtDlg::writeNppPath()
HKEY hKey, hRootKey; HKEY hKey, hRootKey;
DWORD dwDisp = 0; DWORD dwDisp = 0;
long nRet = 0; long nRet = 0;
generic_string regStr(nppName); std::wstring regStr(nppName);
regStr += TEXT("\\shell\\open\\command"); regStr += L"\\shell\\open\\command";
nRet = ::RegCreateKeyEx(HKEY_CLASSES_ROOT, regStr.c_str(), 0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &hKey, &dwDisp); 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' }; TCHAR nppPath[MAX_PATH] = { '\0' };
::GetModuleFileName(_hInst, nppPath, MAX_PATH); ::GetModuleFileName(_hInst, nppPath, MAX_PATH);
TCHAR nppPathParam[MAX_PATH] = TEXT("\""); TCHAR nppPathParam[MAX_PATH] = L"\"";
wcscat_s(nppPathParam, nppPath); wcscat_s(nppPathParam, nppPath);
wcscat_s(nppPathParam, TEXT("\" \"%1\"")); wcscat_s(nppPathParam, L"\" \"%1\"");
::RegSetValueEx(hKey, nullptr, 0, REG_SZ, (LPBYTE)nppPathParam, static_cast<DWORD>((lstrlen(nppPathParam) + 1) * sizeof(TCHAR))); ::RegSetValueEx(hKey, nullptr, 0, REG_SZ, (LPBYTE)nppPathParam, static_cast<DWORD>((lstrlen(nppPathParam) + 1) * sizeof(TCHAR)));
} }
@ -448,7 +448,7 @@ void RegExtDlg::writeNppPath()
//Set default icon value //Set default icon value
regStr = nppName; 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); nRet = ::RegCreateKeyEx(HKEY_CLASSES_ROOT, regStr.c_str(), 0, nullptr, 0, KEY_ALL_ACCESS, nullptr, &hKey, &dwDisp);
if (nRet == ERROR_SUCCESS) if (nRet == ERROR_SUCCESS)
@ -458,9 +458,9 @@ void RegExtDlg::writeNppPath()
TCHAR nppPath[MAX_PATH] = { '\0' }; TCHAR nppPath[MAX_PATH] = { '\0' };
::GetModuleFileName(_hInst, nppPath, MAX_PATH); ::GetModuleFileName(_hInst, nppPath, MAX_PATH);
TCHAR nppPathParam[MAX_PATH] = TEXT("\""); TCHAR nppPathParam[MAX_PATH] = L"\"";
wcscat_s(nppPathParam, nppPath); wcscat_s(nppPathParam, nppPath);
wcscat_s(nppPathParam, TEXT("\",0")); wcscat_s(nppPathParam, L"\",0");
::RegSetValueEx(hKey, nullptr, 0, REG_SZ, (LPBYTE)nppPathParam, static_cast<DWORD>((lstrlen(nppPathParam) + 1) * sizeof(TCHAR))); ::RegSetValueEx(hKey, nullptr, 0, REG_SZ, (LPBYTE)nppPathParam, static_cast<DWORD>((lstrlen(nppPathParam) + 1) * sizeof(TCHAR)));
} }

36
PowerEditor/src/MISC/md5/md5Dlgs.cpp
View File

@ -118,7 +118,7 @@ intptr_t CALLBACK HashFromFilesDlg::run_dlgProc(UINT message, WPARAM wParam, LPA
case IDC_HASH_FILEBROWSER_BUTTON: case IDC_HASH_FILEBROWSER_BUTTON:
{ {
CustomFileDialog fDlg(_hSelf); CustomFileDialog fDlg(_hSelf);
fDlg.setExtFilter(TEXT("All types"), TEXT(".*")); fDlg.setExtFilter(L"All types", TEXT(".*"));
const auto& fns = fDlg.doOpenMultiFilesDlg(); const auto& fns = fDlg.doOpenMultiFilesDlg();
if (!fns.empty()) if (!fns.empty())
@ -137,13 +137,13 @@ intptr_t CALLBACK HashFromFilesDlg::run_dlgProc(UINT message, WPARAM wParam, LPA
if (md5Result) if (md5Result)
{ {
files2check += it; files2check += it;
files2check += TEXT("\r\n"); files2check += L"\r\n";
wchar_t* fileName = ::PathFindFileName(it.c_str()); wchar_t* fileName = ::PathFindFileName(it.c_str());
hashResultStr += wmc.char2wchar(md5Result, CP_ACP); hashResultStr += wmc.char2wchar(md5Result, CP_ACP);
hashResultStr += TEXT(" "); hashResultStr += L" ";
hashResultStr += fileName; hashResultStr += fileName;
hashResultStr += TEXT("\r\n"); hashResultStr += L"\r\n";
} }
} }
else else
@ -179,16 +179,16 @@ intptr_t CALLBACK HashFromFilesDlg::run_dlgProc(UINT message, WPARAM wParam, LPA
} }
for (int i = 0; i < _ht; i++) 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 += it;
files2check += TEXT("\r\n"); files2check += L"\r\n";
wchar_t* fileName = ::PathFindFileName(it.c_str()); wchar_t* fileName = ::PathFindFileName(it.c_str());
hashResultStr += hashStr; hashResultStr += hashStr;
hashResultStr += TEXT(" "); hashResultStr += L" ";
hashResultStr += fileName; hashResultStr += fileName;
hashResultStr += TEXT("\r\n"); hashResultStr += L"\r\n";
} }
} }
@ -271,28 +271,28 @@ void HashFromFilesDlg::doDialog(bool isRTL)
{ {
case hash_md5: case hash_md5:
{ {
title = TEXT("Generate MD5 digest from files"); title = L"Generate MD5 digest from files";
buttonText = TEXT("Choose files to &generate MD5..."); buttonText = TEXT("Choose files to &generate MD5...");
} }
break; break;
case hash_sha1: 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..."); buttonText = TEXT("Choose files to &generate SHA-1...");
} }
break; break;
case hash_sha256: 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..."); buttonText = TEXT("Choose files to &generate SHA-256...");
} }
break; break;
case hash_sha512: 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..."); buttonText = TEXT("Choose files to &generate SHA-512...");
} }
break; break;
@ -368,7 +368,7 @@ void HashFromTextDlg::generateHash()
} }
for (int i = 0; i < _ht; i++) 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); ::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); 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 hHashTextEdit = ::GetDlgItem(_hSelf, IDC_HASH_TEXT_EDIT);
const HWND hHashResult = ::GetDlgItem(_hSelf, IDC_HASH_RESULT_FOMTEXT_EDIT); const HWND hHashResult = ::GetDlgItem(_hSelf, IDC_HASH_RESULT_FOMTEXT_EDIT);
@ -633,25 +633,25 @@ void HashFromTextDlg::doDialog(bool isRTL)
{ {
case hash_md5: case hash_md5:
{ {
title = TEXT("Generate MD5 digest"); title = L"Generate MD5 digest";
} }
break; break;
case hash_sha1: case hash_sha1:
{ {
title = TEXT("Generate SHA-1 digest"); title = L"Generate SHA-1 digest";
} }
break; break;
case hash_sha256: case hash_sha256:
{ {
title = TEXT("Generate SHA-256 digest"); title = L"Generate SHA-256 digest";
} }
break; break;
case hash_sha512: case hash_sha512:
{ {
title = TEXT("Generate SHA-512 digest"); title = L"Generate SHA-512 digest";
} }
break; break;

30
PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp
View File

@ -145,7 +145,7 @@ bool FunctionCallTip::getCursorFunction()
return false; //cannot be a func, need name and separator return false; //cannot be a func, need name and separator
} }
TCHAR lineData[maxLen] = TEXT(""); TCHAR lineData[maxLen] = L"";
_pEditView->getLine(line, lineData, len); _pEditView->getLine(line, lineData, len);
@ -298,10 +298,10 @@ bool FunctionCallTip::loadFunction()
//Iterate through all keywords and find the correct function keyword //Iterate through all keywords and find the correct function keyword
TiXmlElement *funcNode = _pXmlKeyword; TiXmlElement *funcNode = _pXmlKeyword;
for (; funcNode; funcNode = funcNode->NextSiblingElement(TEXT("KeyWord"))) for (; funcNode; funcNode = funcNode->NextSiblingElement(L"KeyWord"))
{ {
const TCHAR * name = NULL; const TCHAR * name = NULL;
name = funcNode->Attribute(TEXT("name")); name = funcNode->Attribute(L"name");
if (!name) //malformed node if (!name) //malformed node
continue; continue;
int compVal = 0; int compVal = 0;
@ -311,10 +311,10 @@ bool FunctionCallTip::loadFunction()
compVal = lstrcmp(name, _funcName); compVal = lstrcmp(name, _funcName);
if (!compVal) //found it! if (!compVal) //found it!
{ {
const TCHAR * val = funcNode->Attribute(TEXT("func")); const TCHAR * val = funcNode->Attribute(L"func");
if (val) if (val)
{ {
if (!lstrcmp(val, TEXT("yes"))) if (!lstrcmp(val, L"yes"))
{ {
//what we've been looking for //what we've been looking for
_curFunction = funcNode; _curFunction = funcNode;
@ -335,25 +335,25 @@ bool FunctionCallTip::loadFunction()
stringVec paramVec; stringVec paramVec;
TiXmlElement *overloadNode = _curFunction->FirstChildElement(TEXT("Overload")); TiXmlElement *overloadNode = _curFunction->FirstChildElement(L"Overload");
TiXmlElement *paramNode = NULL; 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) if (!retVal)
continue; //malformed node continue; //malformed node
_retVals.push_back(retVal); _retVals.push_back(retVal);
const TCHAR * description = overloadNode->Attribute(TEXT("descr")); const TCHAR * description = overloadNode->Attribute(L"descr");
if (description) if (description)
_descriptions.push_back(description); _descriptions.push_back(description);
else else
_descriptions.push_back(TEXT("")); //"no description available" _descriptions.push_back(L""); //"no description available"
paramNode = overloadNode->FirstChildElement(TEXT("Param")); paramNode = overloadNode->FirstChildElement(L"Param");
for (; paramNode ; paramNode = paramNode->NextSiblingElement(TEXT("Param")) ) for (; paramNode ; paramNode = paramNode->NextSiblingElement(L"Param") )
{ {
const TCHAR * param = paramNode->Attribute(TEXT("name")); const TCHAR * param = paramNode->Attribute(L"name");
if (!param) if (!param)
continue; //malformed node continue; //malformed node
paramVec.push_back(param); paramVec.push_back(param);
@ -401,7 +401,7 @@ void FunctionCallTip::showCalltip()
if (_currentNbOverloads > 1) 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; callTipText << _retVals.at(_currentOverload) << TEXT(' ') << _funcName << TEXT(' ') << _start;
@ -424,7 +424,7 @@ void FunctionCallTip::showCalltip()
callTipText << _stop; callTipText << _stop;
if (_descriptions.at(_currentOverload)[0]) if (_descriptions.at(_currentOverload)[0])
{ {
callTipText << TEXT("\n") << _descriptions.at(_currentOverload); callTipText << L"\n" << _descriptions.at(_currentOverload);
} }
if (isVisible()) if (isVisible())

12
PowerEditor/src/ScintillaComponent/columnEditor.cpp
View File

@ -57,9 +57,9 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR
if (colEditParam._repeatNum != -1) if (colEditParam._repeatNum != -1)
::SetDlgItemInt(_hSelf, IDC_COL_REPEATNUM_EDIT, colEditParam._repeatNum, FALSE); ::SetDlgItemInt(_hSelf, IDC_COL_REPEATNUM_EDIT, colEditParam._repeatNum, FALSE);
::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(TEXT("None"))); ::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"None"));
::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(TEXT("Zeros"))); ::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Zeros"));
::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(TEXT("Spaces"))); ::SendDlgItemMessage(_hSelf, IDC_COL_LEADING_COMBO, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Spaces"));
WPARAM curSel = 0; WPARAM curSel = 0;
switch (colEditParam._leadingChoice) switch (colEditParam._leadingChoice)
{ {
@ -404,7 +404,7 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR
{ {
::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize); ::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize);
if (lstrcmp(str, TEXT("")) == 0) if (lstrcmp(str, L"") == 0)
{ {
colEditParam._initialNum = -1; colEditParam._initialNum = -1;
return TRUE; return TRUE;
@ -418,7 +418,7 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR
{ {
::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize); ::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize);
if (lstrcmp(str, TEXT("")) == 0) if (lstrcmp(str, L"") == 0)
{ {
colEditParam._increaseNum = -1; colEditParam._increaseNum = -1;
return TRUE; return TRUE;
@ -432,7 +432,7 @@ intptr_t CALLBACK ColumnEditorDlg::run_dlgProc(UINT message, WPARAM wParam, LPAR
{ {
::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize); ::GetDlgItemText(_hSelf, LOWORD(wParam), str, stringSize);
if (lstrcmp(str, TEXT("")) == 0) if (lstrcmp(str, L"") == 0)
{ {
colEditParam._repeatNum = -1; colEditParam._repeatNum = -1;
return TRUE; return TRUE;

14
PowerEditor/src/WinControls/AnsiCharPanel/ansiCharPanel.cpp
View File

@ -19,6 +19,8 @@
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
#include "localization.h" #include "localization.h"
using namespace std;
void AnsiCharPanel::switchEncoding() void AnsiCharPanel::switchEncoding()
{ {
int codepage = (*_ppEditView)->getCurrentBuffer()->getEncoding(); int codepage = (*_ppEditView)->getCurrentBuffer()->getEncoding();
@ -33,12 +35,12 @@ intptr_t CALLBACK AnsiCharPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM
{ {
NppParameters& nppParam = NppParameters::getInstance(); NppParameters& nppParam = NppParameters::getInstance();
NativeLangSpeaker *pNativeSpeaker = nppParam.getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = nppParam.getNativeLangSpeaker();
generic_string valStr = pNativeSpeaker->getAttrNameStr(TEXT("Value"), "AsciiInsertion", "ColumnVal"); wstring valStr = pNativeSpeaker->getAttrNameStr(L"Value", "AsciiInsertion", "ColumnVal");
generic_string hexStr = pNativeSpeaker->getAttrNameStr(TEXT("Hex"), "AsciiInsertion", "ColumnHex"); wstring hexStr = pNativeSpeaker->getAttrNameStr(L"Hex", "AsciiInsertion", "ColumnHex");
generic_string charStr = pNativeSpeaker->getAttrNameStr(TEXT("Character"), "AsciiInsertion", "ColumnChar"); wstring charStr = pNativeSpeaker->getAttrNameStr(L"Character", "AsciiInsertion", "ColumnChar");
generic_string htmlNameStr = pNativeSpeaker->getAttrNameStr(L"HTML Name", "AsciiInsertion", "ColumnHtmlName"); wstring htmlNameStr = pNativeSpeaker->getAttrNameStr(L"HTML Name", "AsciiInsertion", "ColumnHtmlName");
generic_string htmlNumberStr = pNativeSpeaker->getAttrNameStr(L"HTML Decimal", "AsciiInsertion", "ColumnHtmlNumber"); wstring htmlNumberStr = pNativeSpeaker->getAttrNameStr(L"HTML Decimal", "AsciiInsertion", "ColumnHtmlNumber");
generic_string htmlHexNbStr = pNativeSpeaker->getAttrNameStr(L"HTML Hexadecimal", "AsciiInsertion", "ColumnHtmlHexNb"); wstring htmlHexNbStr = pNativeSpeaker->getAttrNameStr(L"HTML Hexadecimal", "AsciiInsertion", "ColumnHtmlHexNb");
_listView.addColumn(columnInfo(valStr, nppParam._dpiManager.scaleX(45))); _listView.addColumn(columnInfo(valStr, nppParam._dpiManager.scaleX(45)));
_listView.addColumn(columnInfo(hexStr, nppParam._dpiManager.scaleX(45))); _listView.addColumn(columnInfo(hexStr, nppParam._dpiManager.scaleX(45)));

394
PowerEditor/src/WinControls/AnsiCharPanel/asciiListView.cpp
View File

@ -35,73 +35,73 @@ generic_string AsciiListView::getAscii(unsigned char value)
switch (value) switch (value)
{ {
case 0: case 0:
return TEXT("NULL"); return L"NULL";
case 1: case 1:
return TEXT("SOH"); return L"SOH";
case 2: case 2:
return TEXT("STX"); return L"STX";
case 3: case 3:
return TEXT("ETX"); return L"ETX";
case 4: case 4:
return TEXT("EOT"); return L"EOT";
case 5: case 5:
return TEXT("ENQ"); return L"ENQ";
case 6: case 6:
return TEXT("ACK"); return L"ACK";
case 7: case 7:
return TEXT("BEL"); return L"BEL";
case 8: case 8:
return TEXT("BS"); return L"BS";
case 9: case 9:
return TEXT("TAB"); return L"TAB";
case 10: case 10:
return TEXT("LF"); return L"LF";
case 11: case 11:
return TEXT("VT"); return L"VT";
case 12: case 12:
return TEXT("FF"); return L"FF";
case 13: case 13:
return TEXT("CR"); return L"CR";
case 14: case 14:
return TEXT("SO"); return L"SO";
case 15: case 15:
return TEXT("SI"); return L"SI";
case 16: case 16:
return TEXT("DLE"); return L"DLE";
case 17: case 17:
return TEXT("DC1"); return L"DC1";
case 18: case 18:
return TEXT("DC2"); return L"DC2";
case 19: case 19:
return TEXT("DC3"); return L"DC3";
case 20: case 20:
return TEXT("DC4"); return L"DC4";
case 21: case 21:
return TEXT("NAK"); return L"NAK";
case 22: case 22:
return TEXT("SYN"); return L"SYN";
case 23: case 23:
return TEXT("ETB"); return L"ETB";
case 24: case 24:
return TEXT("CAN"); return L"CAN";
case 25: case 25:
return TEXT("EM"); return L"EM";
case 26: case 26:
return TEXT("SUB"); return L"SUB";
case 27: case 27:
return TEXT("ESC"); return L"ESC";
case 28: case 28:
return TEXT("FS"); return L"FS";
case 29: case 29:
return TEXT("GS"); return L"GS";
case 30: case 30:
return TEXT("RS"); return L"RS";
case 31: case 31:
return TEXT("US"); return L"US";
case 32: case 32:
return TEXT("Space"); return L"Space";
case 127: case 127:
return TEXT("DEL"); return L"DEL";
default: default:
{ {
wchar_t charStr[10]{}; wchar_t charStr[10]{};
@ -120,318 +120,318 @@ generic_string AsciiListView::getHtmlName(unsigned char value)
switch (value) switch (value)
{ {
case 33: case 33:
return TEXT("&excl;"); return L"&excl;";
case 34: case 34:
return TEXT("&quot;"); return L"&quot;";
case 35: case 35:
return TEXT("&num;"); return L"&num;";
case 36: case 36:
return TEXT("&dollar;"); return L"&dollar;";
case 37: case 37:
return TEXT("&percnt;"); return L"&percnt;";
case 38: case 38:
return TEXT("&amp;"); return L"&amp;";
case 39: case 39:
return TEXT("&apos;"); return L"&apos;";
case 40: case 40:
return TEXT("&lpar;"); return L"&lpar;";
case 41: case 41:
return TEXT("&rpar;"); return L"&rpar;";
case 42: case 42:
return TEXT("&ast;"); return L"&ast;";
case 43: case 43:
return TEXT("&plus;"); return L"&plus;";
case 44: case 44:
return TEXT("&comma;"); return L"&comma;";
case 45: case 45:
return TEXT("&minus;"); return L"&minus;";
case 46: case 46:
return TEXT("&period;"); return L"&period;";
case 47: case 47:
return TEXT("&sol;"); return L"&sol;";
case 58: case 58:
return TEXT("&colon;"); return L"&colon;";
case 59: case 59:
return TEXT("&semi;"); return L"&semi;";
case 60: case 60:
return TEXT("&lt;"); return L"&lt;";
case 61: case 61:
return TEXT("&equals;"); return L"&equals;";
case 62: case 62:
return TEXT("&gt;"); return L"&gt;";
case 63: case 63:
return TEXT("&quest;"); return L"&quest;";
case 64: case 64:
return TEXT("&commat;"); return L"&commat;";
case 91: case 91:
return TEXT("&lbrack;"); return L"&lbrack;";
case 92: case 92:
return TEXT("&bsol;"); return L"&bsol;";
case 93: case 93:
return TEXT("&rbrack;"); return L"&rbrack;";
case 94: case 94:
return TEXT("&Hat;"); return L"&Hat;";
case 95: case 95:
return TEXT("&lowbar;"); return L"&lowbar;";
case 96: case 96:
return TEXT("&grave;"); return L"&grave;";
case 123: case 123:
return TEXT("&lbrace;"); return L"&lbrace;";
case 124: case 124:
return TEXT("&vert;"); return L"&vert;";
case 125: case 125:
return TEXT("&rbrace;"); return L"&rbrace;";
case 126: case 126:
return TEXT(""); // ascii tilde return L""; // ascii tilde
case 128: case 128:
return TEXT("&euro;"); return L"&euro;";
case 130: case 130:
return TEXT("&sbquo;"); return L"&sbquo;";
case 131: case 131:
return TEXT("&fnof;"); return L"&fnof;";
case 132: case 132:
return TEXT("&bdquo;"); return L"&bdquo;";
case 133: case 133:
return TEXT("&hellip;"); return L"&hellip;";
case 134: case 134:
return TEXT("&dagger;"); return L"&dagger;";
case 135: case 135:
return TEXT("&Dagger;"); return L"&Dagger;";
case 136: case 136:
return TEXT("&circ;"); return L"&circ;";
case 137: case 137:
return TEXT("&permil;"); return L"&permil;";
case 138: case 138:
return TEXT("&Scaron;"); return L"&Scaron;";
case 139: case 139:
return TEXT("&lsaquo;"); return L"&lsaquo;";
case 140: case 140:
return TEXT("&OElig;"); return L"&OElig;";
case 142: case 142:
return TEXT("&Zcaron;"); return L"&Zcaron;";
case 145: case 145:
return TEXT("&lsquo;"); return L"&lsquo;";
case 146: case 146:
return TEXT("&rsquo;"); return L"&rsquo;";
case 147: case 147:
return TEXT("&ldquo;"); return L"&ldquo;";
case 148: case 148:
return TEXT("&rdquo;"); return L"&rdquo;";
case 149: case 149:
return TEXT("&bull;"); return L"&bull;";
case 150: case 150:
return TEXT("&ndash;"); return L"&ndash;";
case 151: case 151:
return TEXT("&mdash;"); return L"&mdash;";
case 152: case 152:
return TEXT("&tilde;"); return L"&tilde;";
case 153: case 153:
return TEXT("&trade;"); return L"&trade;";
case 154: case 154:
return TEXT("&scaron;"); return L"&scaron;";
case 155: case 155:
return TEXT("&rsaquo;"); return L"&rsaquo;";
case 156: case 156:
return TEXT("&oelig;"); return L"&oelig;";
case 158: case 158:
return TEXT("&zcaron;"); return L"&zcaron;";
case 159: case 159:
return TEXT("&Yuml;"); return L"&Yuml;";
case 160: case 160:
return TEXT("&nbsp;"); return L"&nbsp;";
case 161: case 161:
return TEXT("&iexcl;"); return L"&iexcl;";
case 162: case 162:
return TEXT("&cent;"); return L"&cent;";
case 163: case 163:
return TEXT("&pound;"); return L"&pound;";
case 164: case 164:
return TEXT("&curren;"); return L"&curren;";
case 165: case 165:
return TEXT("&yen;"); return L"&yen;";
case 166: case 166:
return TEXT("&brvbar;"); return L"&brvbar;";
case 167: case 167:
return TEXT("&sect;"); return L"&sect;";
case 168: case 168:
return TEXT("&uml;"); return L"&uml;";
case 169: case 169:
return TEXT("&copy;"); return L"&copy;";
case 170: case 170:
return TEXT("&ordf;"); return L"&ordf;";
case 171: case 171:
return TEXT("&laquo;"); return L"&laquo;";
case 172: case 172:
return TEXT("&not;"); return L"&not;";
case 173: case 173:
return TEXT("&shy;"); return L"&shy;";
case 174: case 174:
return TEXT("&reg;"); return L"&reg;";
case 175: case 175:
return TEXT("&macr;"); return L"&macr;";
case 176: case 176:
return TEXT("&deg;"); return L"&deg;";
case 177: case 177:
return TEXT("&plusmn;"); return L"&plusmn;";
case 178: case 178:
return TEXT("&sup2;"); return L"&sup2;";
case 179: case 179:
return TEXT("&sup3;"); return L"&sup3;";
case 180: case 180:
return TEXT("&acute;"); return L"&acute;";
case 181: case 181:
return TEXT("&micro;"); return L"&micro;";
case 182: case 182:
return TEXT("&para;"); return L"&para;";
case 183: case 183:
return TEXT("&middot;"); return L"&middot;";
case 184: case 184:
return TEXT("&cedil;"); return L"&cedil;";
case 185: case 185:
return TEXT("&sup1;"); return L"&sup1;";
case 186: case 186:
return TEXT("&ordm;"); return L"&ordm;";
case 187: case 187:
return TEXT("&raquo;"); return L"&raquo;";
case 188: case 188:
return TEXT("&frac14;"); return L"&frac14;";
case 189: case 189:
return TEXT("&frac12;"); return L"&frac12;";
case 190: case 190:
return TEXT("&frac34;"); return L"&frac34;";
case 191: case 191:
return TEXT("&iquest;"); return L"&iquest;";
case 192: case 192:
return TEXT("&Agrave;"); return L"&Agrave;";
case 193: case 193:
return TEXT("&Aacute;"); return L"&Aacute;";
case 194: case 194:
return TEXT("&Acirc;"); return L"&Acirc;";
case 195: case 195:
return TEXT("&Atilde;"); return L"&Atilde;";
case 196: case 196:
return TEXT("&Auml;"); return L"&Auml;";
case 197: case 197:
return TEXT("&Aring;"); return L"&Aring;";
case 198: case 198:
return TEXT("&AElig;"); return L"&AElig;";
case 199: case 199:
return TEXT("&Ccedil;"); return L"&Ccedil;";
case 200: case 200:
return TEXT("&Egrave;"); return L"&Egrave;";
case 201: case 201:
return TEXT("&Eacute;"); return L"&Eacute;";
case 202: case 202:
return TEXT("&Ecirc;"); return L"&Ecirc;";
case 203: case 203:
return TEXT("&Euml;"); return L"&Euml;";
case 204: case 204:
return TEXT("&Igrave;"); return L"&Igrave;";
case 205: case 205:
return TEXT("&Iacute;"); return L"&Iacute;";
case 206: case 206:
return TEXT("&Icirc;"); return L"&Icirc;";
case 207: case 207:
return TEXT("&Iuml;"); return L"&Iuml;";
case 208: case 208:
return TEXT("&ETH;"); return L"&ETH;";
case 209: case 209:
return TEXT("&Ntilde;"); return L"&Ntilde;";
case 210: case 210:
return TEXT("&Ograve;"); return L"&Ograve;";
case 211: case 211:
return TEXT("&Oacute;"); return L"&Oacute;";
case 212: case 212:
return TEXT("&Ocirc;"); return L"&Ocirc;";
case 213: case 213:
return TEXT("&Otilde;"); return L"&Otilde;";
case 214: case 214:
return TEXT("&Ouml;"); return L"&Ouml;";
case 215: case 215:
return TEXT("&times;"); return L"&times;";
case 216: case 216:
return TEXT("&Oslash;"); return L"&Oslash;";
case 217: case 217:
return TEXT("&Ugrave;"); return L"&Ugrave;";
case 218: case 218:
return TEXT("&Uacute;"); return L"&Uacute;";
case 219: case 219:
return TEXT("&Ucirc;"); return L"&Ucirc;";
case 220: case 220:
return TEXT("&Uuml;"); return L"&Uuml;";
case 221: case 221:
return TEXT("&Yacute;"); return L"&Yacute;";
case 222: case 222:
return TEXT("&THORN;"); return L"&THORN;";
case 223: case 223:
return TEXT("&szlig;"); return L"&szlig;";
case 224: case 224:
return TEXT("&agrave;"); return L"&agrave;";
case 225: case 225:
return TEXT("&aacute;"); return L"&aacute;";
case 226: case 226:
return TEXT("&acirc;"); return L"&acirc;";
case 227: case 227:
return TEXT("&atilde;"); return L"&atilde;";
case 228: case 228:
return TEXT("&auml;"); return L"&auml;";
case 229: case 229:
return TEXT("&aring;"); return L"&aring;";
case 230: case 230:
return TEXT("&aelig;"); return L"&aelig;";
case 231: case 231:
return TEXT("&ccedil;"); return L"&ccedil;";
case 232: case 232:
return TEXT("&egrave;"); return L"&egrave;";
case 233: case 233:
return TEXT("&eacute;"); return L"&eacute;";
case 234: case 234:
return TEXT("&ecirc;"); return L"&ecirc;";
case 235: case 235:
return TEXT("&euml;"); return L"&euml;";
case 236: case 236:
return TEXT("&igrave;"); return L"&igrave;";
case 237: case 237:
return TEXT("&iacute;"); return L"&iacute;";
case 238: case 238:
return TEXT("&icirc;"); return L"&icirc;";
case 239: case 239:
return TEXT("&iuml;"); return L"&iuml;";
case 240: case 240:
return TEXT("&eth;"); return L"&eth;";
case 241: case 241:
return TEXT("&ntilde;"); return L"&ntilde;";
case 242: case 242:
return TEXT("&ograve;"); return L"&ograve;";
case 243: case 243:
return TEXT("&oacute;"); return L"&oacute;";
case 244: case 244:
return TEXT("&ocirc;"); return L"&ocirc;";
case 245: case 245:
return TEXT("&otilde;"); return L"&otilde;";
case 246: case 246:
return TEXT("&ouml;"); return L"&ouml;";
case 247: case 247:
return TEXT("&divide;"); return L"&divide;";
case 248: case 248:
return TEXT("&oslash;"); return L"&oslash;";
case 249: case 249:
return TEXT("&ugrave;"); return L"&ugrave;";
case 250: case 250:
return TEXT("&uacute;"); return L"&uacute;";
case 251: case 251:
return TEXT("&ucirc;"); return L"&ucirc;";
case 252: case 252:
return TEXT("&uuml;"); return L"&uuml;";
case 253: case 253:
return TEXT("&yacute;"); return L"&yacute;";
case 254: case 254:
return TEXT("&thorn;"); return L"&thorn;";
case 255: case 255:
return TEXT("&yuml;"); return L"&yuml;";
default: default:
{ {
return TEXT(""); return L"";
} }
} }
} }
@ -516,8 +516,8 @@ void AsciiListView::setValues(int codepage)
wchar_t htmlNumber[bufSize]{}; wchar_t htmlNumber[bufSize]{};
wchar_t htmlHexNumber[bufSizeHex]{}; wchar_t htmlHexNumber[bufSizeHex]{};
generic_string htmlName; generic_string htmlName;
swprintf(dec, bufSize, TEXT("%d"), i); swprintf(dec, bufSize, L"%d", i);
swprintf(hex, bufSize, TEXT("%02X"), i); swprintf(hex, bufSize, L"%02X", i);
generic_string s = getAscii(static_cast<unsigned char>(i)); generic_string s = getAscii(static_cast<unsigned char>(i));
if (codepage == 0 || codepage == 1252) if (codepage == 0 || codepage == 1252)
@ -537,8 +537,8 @@ void AsciiListView::setValues(int codepage)
} }
else else
{ {
swprintf(htmlNumber, bufSize, TEXT("")); swprintf(htmlNumber, bufSize, L"");
swprintf(htmlHexNumber, bufSizeHex, TEXT("")); swprintf(htmlHexNumber, bufSizeHex, L"");
} }
} }
@ -546,9 +546,9 @@ void AsciiListView::setValues(int codepage)
} }
else else
{ {
swprintf(htmlNumber, bufSize, TEXT("")); swprintf(htmlNumber, bufSize, L"");
swprintf(htmlHexNumber, bufSizeHex, TEXT("")); swprintf(htmlHexNumber, bufSizeHex, L"");
htmlName = TEXT(""); htmlName = L"";
} }
std::vector<generic_string> values2Add; std::vector<generic_string> values2Add;

44
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
View File

@ -110,7 +110,7 @@ intptr_t CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM
_currentThemeIndex = j; _currentThemeIndex = j;
_themeName.assign(themeInfo.second); _themeName.assign(themeInfo.second);
} }
if (! themeInfo.first.compare(TEXT("Default")) ) if (! themeInfo.first.compare(L"Default") )
{ {
defaultThemeIndex = j; defaultThemeIndex = j;
} }
@ -153,7 +153,7 @@ intptr_t CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM
setVisualFromStyleList(); setVisualFromStyleList();
_goToSettings.init(_hInst, _hSelf); _goToSettings.init(_hInst, _hSelf);
_goToSettings.create(::GetDlgItem(_hSelf, IDC_GLOBAL_GOTOSETTINGS_LINK), TEXT("")); _goToSettings.create(::GetDlgItem(_hSelf, IDC_GLOBAL_GOTOSETTINGS_LINK), L"");
std::pair<intptr_t, intptr_t> pageAndCtrlID = goToPreferencesSettings(); std::pair<intptr_t, intptr_t> pageAndCtrlID = goToPreferencesSettings();
_goToSettings.display(pageAndCtrlID.first != -1); _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; isTextEnabled = HIBYTE(HIWORD(style._fgColor)) != 0xFF;
// Selected text colour style // Selected text colour style
if (style._styleDesc == TEXT("Selected text colour")) if (style._styleDesc == L"Selected text colour")
{ {
isTextEnabled = NppParameters::getInstance().isSelectFgColorEnabled(); isTextEnabled = NppParameters::getInstance().isSelectFgColorEnabled();
} }
@ -599,7 +599,7 @@ void WordStyleDlg::loadLangListFromNppParam()
// Clean up Language List // Clean up Language List
::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_RESETCONTENT, 0, 0); ::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_RESETCONTENT, 0, 0);
::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_ADDSTRING, 0, reinterpret_cast<LPARAM>(TEXT("Global Styles"))); ::SendDlgItemMessage(_hSelf, IDC_LANGUAGES_LIST, LB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Global Styles"));
// All the lexers // All the lexers
for (size_t i = 0, nb = _lsArray.getNbLexer() ; i < nb ; ++i) for (size_t i = 0, nb = _lsArray.getNbLexer() ; i < nb ; ++i)
{ {
@ -950,27 +950,27 @@ std::pair<intptr_t, intptr_t> WordStyleDlg::goToPreferencesSettings()
const Style& style = getCurrentStyler(); const Style& style = getCurrentStyler();
// Global override style // Global override style
if (style._styleDesc == TEXT("Current line background colour")) if (style._styleDesc == L"Current line background colour")
{ {
result.first = edit1; result.first = edit1;
result.second = IDC_RADIO_CLM_HILITE; result.second = IDC_RADIO_CLM_HILITE;
} }
else if (style._styleDesc == TEXT("Caret colour")) else if (style._styleDesc == L"Caret colour")
{ {
result.first = edit1; result.first = edit1;
result.second = IDC_WIDTH_COMBO; result.second = IDC_WIDTH_COMBO;
} }
else if (style._styleDesc == TEXT("Edge colour")) else if (style._styleDesc == L"Edge colour")
{ {
result.first = margins; result.first = margins;
result.second = IDC_COLUMNPOS_EDIT; 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.first = margins;
result.second = IDC_CHECK_LINENUMBERMARGE; result.second = IDC_CHECK_LINENUMBERMARGE;
} }
else if (style._styleDesc == TEXT("Bookmark margin")) else if (style._styleDesc == L"Bookmark margin")
{ {
result.first = margins; result.first = margins;
result.second = IDC_CHECK_BOOKMARKMARGE; result.second = IDC_CHECK_BOOKMARKMARGE;
@ -982,38 +982,38 @@ std::pair<intptr_t, intptr_t> WordStyleDlg::goToPreferencesSettings()
result.first = margins; result.first = margins;
result.second = IDC_CHECK_CHANGHISTORYMARGIN; 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.first = margins;
result.second = IDC_RADIO_BOX; result.second = IDC_RADIO_BOX;
} }
else if (style._styleDesc == TEXT("Smart Highlighting")) else if (style._styleDesc == L"Smart Highlighting")
{ {
result.first = highlighting; result.first = highlighting;
result.second = IDC_CHECK_ENABLSMARTHILITE; 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.first = highlighting;
result.second = IDC_CHECK_ENABLTAGSMATCHHILITE; result.second = IDC_CHECK_ENABLTAGSMATCHHILITE;
} }
else if (style._styleDesc == TEXT("Tags attribute")) else if (style._styleDesc == L"Tags attribute")
{ {
result.first = highlighting; result.first = highlighting;
result.second = IDC_CHECK_ENABLTAGATTRHILITE; 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") else if (style._styleDesc == L"Mark Style 1" || style._styleDesc == L"Mark Style 2" || style._styleDesc == L"Mark Style 3"
|| style._styleDesc == TEXT("Mark Style 4") || style._styleDesc == TEXT("Mark Style 5")) || style._styleDesc == L"Mark Style 4" || style._styleDesc == L"Mark Style 5")
{ {
result.first = highlighting; result.first = highlighting;
result.second = IDC_CHECK_MARKALLCASESENSITIVE; result.second = IDC_CHECK_MARKALLCASESENSITIVE;
} }
else if (style._styleDesc == TEXT("URL hovered")) else if (style._styleDesc == L"URL hovered")
{ {
result.first = cloudAndLink; result.first = cloudAndLink;
result.second = IDC_CHECK_CLICKABLELINK_ENABLE; 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.first = edit2;
result.second = IDC_CHECK_WITHCUSTOMCOLOR_CRLF; result.second = IDC_CHECK_WITHCUSTOMCOLOR_CRLF;
@ -1034,7 +1034,7 @@ void WordStyleDlg::setVisualFromStyleList()
Style & style = getCurrentStyler(); Style & style = getCurrentStyler();
// Global override style // Global override style
if (style._styleDesc == TEXT("Global override")) if (style._styleDesc == L"Global override")
{ {
showGlobalOverrideCtrls(true); showGlobalOverrideCtrls(true);
} }
@ -1073,7 +1073,7 @@ void WordStyleDlg::setVisualFromStyleList()
wcscat_s(str, styleName); wcscat_s(str, styleName);
// PAD for fix a display glitch // PAD for fix a display glitch
wcscat_s(str, TEXT(" ")); wcscat_s(str, L" ");
_colourHooker.setColour(c); _colourHooker.setColour(c);
::SetWindowText(_hStyleInfoStaticText, str); ::SetWindowText(_hStyleInfoStaticText, str);
@ -1087,7 +1087,7 @@ void WordStyleDlg::setVisualFromStyleList()
} }
// Selected text colour style // 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 isEnable = false; // disable by default for "Selected text colour" style
@ -1126,7 +1126,7 @@ void WordStyleDlg::setVisualFromStyleList()
LRESULT iFontSize = 0; LRESULT iFontSize = 0;
if (style._fontSize != STYLE_NOT_USED && style._fontSize < 100) // style._fontSize has only 2 digits 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<LPARAM>(intStr)); iFontSize = ::SendMessage(_hFontSizeCombo, CB_FINDSTRING, 1, reinterpret_cast<LPARAM>(intStr));
} }
::SendMessage(_hFontSizeCombo, CB_SETCURSEL, iFontSize, 0); ::SendMessage(_hFontSizeCombo, CB_SETCURSEL, iFontSize, 0);
@ -1169,7 +1169,7 @@ void WordStyleDlg::setVisualFromStyleList()
} }
const TCHAR *kws = nppParams.getWordList(lType, style._keywordClass); const TCHAR *kws = nppParams.getWordList(lType, style._keywordClass);
if (!kws) if (!kws)
kws = TEXT(""); kws = L"";
::SendDlgItemMessage(_hSelf, IDC_DEF_KEYWORDS_EDIT, WM_SETTEXT, 0, reinterpret_cast<LPARAM>(kws)); ::SendDlgItemMessage(_hSelf, IDC_DEF_KEYWORDS_EDIT, WM_SETTEXT, 0, reinterpret_cast<LPARAM>(kws));
const TCHAR *ckwStr = style._keywords.c_str(); const TCHAR *ckwStr = style._keywords.c_str();

72
PowerEditor/src/WinControls/Grid/BabyGrid.cpp
View File

@ -140,7 +140,7 @@ void RefreshGrid(HWND hWnd)
int SI = FindGrid(GetMenu(hWnd)); int SI = FindGrid(GetMenu(hWnd));
if (SI >= 0 && BGHS[SI].EDITING) 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); SetCell(&BGcell, r, c);
TCHAR buffer[bufferLen]{}; TCHAR buffer[bufferLen]{};
wcscpy_s(buffer, TEXT("")); wcscpy_s(buffer, L"");
if (BGHS[SI].COLUMNSNUMBERED) if (BGHS[SI].COLUMNSNUMBERED)
{ {
if (c > 0) if (c > 0)
@ -426,7 +426,7 @@ void DisplayColumn(HWND hWnd, int SI, int c, int offset, HFONT hfont, HFONT hcol
else { high += 64; } else { high += 64; }
if (low == 0) { low = 26; } if (low == 0) { low = 26; }
low += 64; low += 64;
wsprintf(buffer, TEXT("%c%c"), high, low); wsprintf(buffer, L"%c%c", high, low);
} }
} }
else else
@ -474,11 +474,11 @@ void DisplayColumn(HWND hWnd, int SI, int c, int offset, HFONT hfont, HFONT hcol
BGCELL BGcell; BGCELL BGcell;
SetCell(&BGcell, r, c); SetCell(&BGcell, r, c);
wcscpy_s(buffer, TEXT("")); wcscpy_s(buffer, L"");
int iProperty = 0; int iProperty = 0;
if ((c == 0) && (BGHS[SI].ROWSNUMBERED)) if ((c == 0) && (BGHS[SI].ROWSNUMBERED))
{ {
wsprintf(buffer, TEXT("%d"), r); wsprintf(buffer, L"%d", r);
iProperty = 2 << 4; // iDataType = NUMERIC iProperty = 2 << 4; // iDataType = NUMERIC
} }
else else
@ -627,7 +627,7 @@ void DisplayColumn(HWND hWnd, int SI, int c, int offset, HFONT hfont, HFONT hcol
if (BGHS[SI].EDITING) if (BGHS[SI].EDITING)
{ {
DisplayEditString(hWnd, SI, TEXT("")); DisplayEditString(hWnd, SI, L"");
} }
rect = rectsave; rect = rectsave;
@ -1029,7 +1029,7 @@ void CloseEdit(HWND hWnd, int SI)
cell.row = r; cell.row = r;
cell.col = c; cell.col = c;
SendMessage(hWnd, BGM_SETCELLDATA, reinterpret_cast<WPARAM>(&cell), reinterpret_cast<LPARAM>(BGHS[SI].editstring)); SendMessage(hWnd, BGM_SETCELLDATA, reinterpret_cast<WPARAM>(&cell), reinterpret_cast<LPARAM>(BGHS[SI].editstring));
wcscpy_s(BGHS[SI].editstring, TEXT("")); wcscpy_s(BGHS[SI].editstring, L"");
RefreshGrid(hWnd); RefreshGrid(hWnd);
BGHS[SI].EDITING = FALSE; BGHS[SI].EDITING = FALSE;
HideCaret(hWnd); HideCaret(hWnd);
@ -1106,7 +1106,7 @@ ATOM RegisterGridClass(HINSTANCE hInstance)
wclass.hCursor = ::LoadCursor(NULL, IDC_ARROW); wclass.hCursor = ::LoadCursor(NULL, IDC_ARROW);
wclass.hbrBackground = (HBRUSH)(GetStockObject(GRAY_BRUSH)); wclass.hbrBackground = (HBRUSH)(GetStockObject(GRAY_BRUSH));
wclass.lpszClassName = TEXT("BABYGRID"); wclass.lpszClassName = L"BABYGRID";
wclass.lpszMenuName = NULL; wclass.lpszMenuName = NULL;
return RegisterClass(&wclass); return RegisterClass(&wclass);
@ -1122,7 +1122,7 @@ int FindLongestLine(HDC hdc, wchar_t* text, SIZE* size)
{ {
int longest = 0; int longest = 0;
wchar_t* buffer = nullptr; wchar_t* buffer = nullptr;
wchar_t* token = WCSTOK(text, TEXT("\n"), &buffer); wchar_t* token = WCSTOK(text, L"\n", &buffer);
while (token) while (token)
{ {
@ -1132,7 +1132,7 @@ int FindLongestLine(HDC hdc, wchar_t* text, SIZE* size)
longest = size->cx; longest = size->cx;
} }
token = WCSTOK(nullptr, TEXT("\n"), &buffer); token = WCSTOK(nullptr, L"\n", &buffer);
} }
return longest; return longest;
} }
@ -1223,7 +1223,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
if (lstrlen((TCHAR*)lParam) > 300) 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 else
{ {
@ -1363,7 +1363,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
ReturnValue = -1; ReturnValue = -1;
break; 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 //see if that cell is already loaded
int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer); int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer);
if (FindResult != LB_ERR) if (FindResult != LB_ERR)
@ -1392,11 +1392,11 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
wcscat_s(buffer, TEXT("|")); wcscat_s(buffer, TEXT("|"));
if ((BOOL)lParam) if ((BOOL)lParam)
{ {
wcscat_s(buffer, TEXT("PA")); wcscat_s(buffer, L"PA");
} }
else else
{ {
wcscat_s(buffer, TEXT("UA")); wcscat_s(buffer, L"UA");
} }
wcscat_s(buffer, TEXT("|")); wcscat_s(buffer, TEXT("|"));
SendMessage(BGHS[SelfIndex].hlist1, LB_ADDSTRING, FindResult, reinterpret_cast<LPARAM>(buffer)); SendMessage(BGHS[SelfIndex].hlist1, LB_ADDSTRING, FindResult, reinterpret_cast<LPARAM>(buffer));
@ -1413,11 +1413,11 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case BGM_SETPROTECT: case BGM_SETPROTECT:
if ((BOOL)wParam) if ((BOOL)wParam)
{ {
wcscpy_s(BGHS[SelfIndex].protect, TEXT("P")); wcscpy_s(BGHS[SelfIndex].protect, L"P");
} }
else else
{ {
wcscpy_s(BGHS[SelfIndex].protect, TEXT("U")); wcscpy_s(BGHS[SelfIndex].protect, L"U");
} }
break; break;
@ -1453,7 +1453,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
ReturnValue = -1; ReturnValue = -1;
break; 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 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; int iDataType = 1;
if (iDataType == 1) { wcscat_s(buffer, TEXT("A")); } if (iDataType == 1) { wcscat_s(buffer, L"A"); }
if (iDataType == 2) { wcscat_s(buffer, TEXT("N")); } if (iDataType == 2) { wcscat_s(buffer, L"N"); }
if (iDataType == 3) { wcscat_s(buffer, TEXT("T")); } if (iDataType == 3) { wcscat_s(buffer, L"T"); }
if (iDataType == 4) { wcscat_s(buffer, TEXT("F")); } if (iDataType == 4) { wcscat_s(buffer, L"F"); }
if (iDataType == 5) { wcscat_s(buffer, TEXT("G")); } if (iDataType == 5) { wcscat_s(buffer, L"G"); }
wcscat_s(buffer, TEXT("|")); wcscat_s(buffer, TEXT("|"));
wcscat_s(buffer, (TCHAR*)lParam); wcscat_s(buffer, (TCHAR*)lParam);
@ -1591,7 +1591,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
ReturnValue = -1; ReturnValue = -1;
break; 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 //see if that cell is already loaded
int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer); int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer);
if (FindResult != LB_ERR) if (FindResult != LB_ERR)
@ -1631,7 +1631,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
} }
else else
{ {
wcscpy_s((TCHAR*)lParam, bufferLen, TEXT("")); wcscpy_s((TCHAR*)lParam, bufferLen, L"");
} }
} }
break; break;
@ -1660,7 +1660,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
ReturnValue = -1; ReturnValue = -1;
break; 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 //see if that cell is already loaded
int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer); int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer);
if (FindResult != LB_ERR) if (FindResult != LB_ERR)
@ -1748,7 +1748,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
ReturnValue = -1; ReturnValue = -1;
break; 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 //see if that cell is already loaded
int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer); int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer);
if (FindResult != LB_ERR) if (FindResult != LB_ERR)
@ -1782,7 +1782,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
ReturnValue = -1; ReturnValue = -1;
break; 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 //see if that cell is already loaded
ReturnValue = 0; ReturnValue = 0;
int FindResult = BinarySearchListBox(BGHS[SelfIndex].hlist1, buffer); 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) if (BGHS[SelfIndex].EDITING)
{ {
BGHS[SelfIndex].EDITING = FALSE; BGHS[SelfIndex].EDITING = FALSE;
wcscpy_s(BGHS[SelfIndex].editstring, TEXT("")); wcscpy_s(BGHS[SelfIndex].editstring, L"");
HideCaret(hWnd); HideCaret(hWnd);
RefreshGrid(hWnd); RefreshGrid(hWnd);
NotifyEditEnd(hWnd, SelfIndex); NotifyEditEnd(hWnd, SelfIndex);
@ -2211,7 +2211,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
if (BGHS[SelfIndex].EDITING) if (BGHS[SelfIndex].EDITING)
{ {
BGHS[SelfIndex].EDITING = FALSE; BGHS[SelfIndex].EDITING = FALSE;
wcscpy_s(BGHS[SelfIndex].editstring, TEXT("")); wcscpy_s(BGHS[SelfIndex].editstring, L"");
HideCaret(hWnd); HideCaret(hWnd);
RefreshGrid(hWnd); RefreshGrid(hWnd);
NotifyEditEnd(hWnd, SelfIndex); NotifyEditEnd(hWnd, SelfIndex);
@ -2467,7 +2467,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
BGHS[SelfIndex].EDITING = TRUE; BGHS[SelfIndex].EDITING = TRUE;
if (lstrlen(BGHS[SelfIndex].editstring) == 0) if (lstrlen(BGHS[SelfIndex].editstring) == 0)
{ {
DisplayEditString(hWnd, SelfIndex, TEXT("")); DisplayEditString(hWnd, SelfIndex, L"");
break; break;
} }
else else
@ -2475,7 +2475,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
int j; int j;
j = lstrlen(BGHS[SelfIndex].editstring); j = lstrlen(BGHS[SelfIndex].editstring);
BGHS[SelfIndex].editstring[j - 1] = 0x00; BGHS[SelfIndex].editstring[j - 1] = 0x00;
DisplayEditString(hWnd, SelfIndex, TEXT("")); DisplayEditString(hWnd, SelfIndex, L"");
} }
break; break;
} }
@ -2691,7 +2691,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
BGHS[SelfIndex].gridmenu = 0; BGHS[SelfIndex].gridmenu = 0;
BGHS[SelfIndex].hlist1 = NULL; BGHS[SelfIndex].hlist1 = NULL;
BGHS[SelfIndex].hfont = 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].rows = 100;
BGHS[SelfIndex].cols = 255; BGHS[SelfIndex].cols = 255;
BGHS[SelfIndex].homerow = 1; BGHS[SelfIndex].homerow = 1;
@ -2832,9 +2832,9 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
CLIP_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
0, 0,
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, 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, 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, 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, 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].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); WS_CHILD | LBS_STANDARD, 50, 150, 200, 100, hWnd, NULL, hInst, NULL);
BGHS[BG_GridIndex].hfont = g_hfontbody; BGHS[BG_GridIndex].hfont = g_hfontbody;

22
PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp
View File

@ -182,7 +182,7 @@ void expandNppEnvironmentStrs(const TCHAR *strSrc, TCHAR *stringDest, size_t str
HINSTANCE Command::run(HWND hWnd) HINSTANCE Command::run(HWND hWnd)
{ {
return run(hWnd, TEXT(".")); return run(hWnd, L".");
} }
HINSTANCE Command::run(HWND hWnd, const TCHAR* cwd) HINSTANCE Command::run(HWND hWnd, const TCHAR* cwd)
@ -216,7 +216,7 @@ HINSTANCE Command::run(HWND hWnd, const TCHAR* cwd)
TCHAR cwd2Exec[MAX_PATH]{}; TCHAR cwd2Exec[MAX_PATH]{};
expandNppEnvironmentStrs(cwd, cwd2Exec, MAX_PATH, hWnd); 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) // 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. // 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; generic_string errorMsg;
errorMsg += GetLastErrorAsString(retResult); errorMsg += GetLastErrorAsString(retResult);
errorMsg += TEXT("An attempt was made to execute the below command."); errorMsg += L"An attempt was made to execute the below command.";
errorMsg += TEXT("\n----------------------------------------------------------"); errorMsg += L"\n----------------------------------------------------------";
errorMsg += TEXT("\nCommand: "); errorMsg += L"\nCommand: ";
errorMsg += cmd2Exec; errorMsg += cmd2Exec;
errorMsg += TEXT("\nArguments: "); errorMsg += L"\nArguments: ";
errorMsg += args2Exec; errorMsg += args2Exec;
errorMsg += TEXT("\nError Code: "); errorMsg += L"\nError Code: ";
errorMsg += intToString(retResult); 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; 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<unsigned int>(-1), 0); ::InsertMenu(hRunMenu, posBase + nbTopLevelItem + 1, MF_BYPOSITION, static_cast<unsigned int>(-1), 0);
NativeLangSpeaker *pNativeLangSpeaker = nppParams.getNativeLangSpeaker(); NativeLangSpeaker *pNativeLangSpeaker = nppParams.getNativeLangSpeaker();
generic_string nativeLangShortcutMapperMacro = pNativeLangSpeaker->getNativeLangMenuString(IDM_SETTING_SHORTCUT_MAPPER_MACRO); generic_string nativeLangShortcutMapperMacro = pNativeLangSpeaker->getNativeLangMenuString(IDM_SETTING_SHORTCUT_MAPPER_MACRO);
if (nativeLangShortcutMapperMacro == TEXT("")) if (nativeLangShortcutMapperMacro == L"")
nativeLangShortcutMapperMacro = runMenu.getLastCmdLabel(); nativeLangShortcutMapperMacro = runMenu.getLastCmdLabel();
::InsertMenu(hRunMenu, posBase + nbTopLevelItem + 2, MF_BYCOMMAND, IDM_SETTING_SHORTCUT_MAPPER_RUN, nativeLangShortcutMapperMacro.c_str()); ::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) if (fn.find(' ') != generic_string::npos)
{ {
generic_string fn_quotes(fn); generic_string fn_quotes(fn);
fn_quotes = TEXT("\"") + fn_quotes + TEXT("\""); fn_quotes = L"\"" + fn_quotes + L"\"";
addTextToCombo(fn_quotes.c_str()); addTextToCombo(fn_quotes.c_str());
} }
else else

22
PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h
View File

@ -21,17 +21,17 @@
#define CURRENTWORD_MAXLENGTH 2048 #define CURRENTWORD_MAXLENGTH 2048
const TCHAR fullCurrentPath[] = TEXT("FULL_CURRENT_PATH"); const TCHAR fullCurrentPath[] = L"FULL_CURRENT_PATH";
const TCHAR currentDirectory[] = TEXT("CURRENT_DIRECTORY"); const TCHAR currentDirectory[] = L"CURRENT_DIRECTORY";
const TCHAR onlyFileName[] = TEXT("FILE_NAME"); const TCHAR onlyFileName[] = L"FILE_NAME";
const TCHAR fileNamePart[] = TEXT("NAME_PART"); const TCHAR fileNamePart[] = L"NAME_PART";
const TCHAR fileExtPart[] = TEXT("EXT_PART"); const TCHAR fileExtPart[] = L"EXT_PART";
const TCHAR currentWord[] = TEXT("CURRENT_WORD"); const TCHAR currentWord[] = L"CURRENT_WORD";
const TCHAR nppDir[] = TEXT("NPP_DIRECTORY"); const TCHAR nppDir[] = L"NPP_DIRECTORY";
const TCHAR nppFullFilePath[] = TEXT("NPP_FULL_FILE_PATH"); const TCHAR nppFullFilePath[] = L"NPP_FULL_FILE_PATH";
const TCHAR currentLine[] = TEXT("CURRENT_LINE"); const TCHAR currentLine[] = L"CURRENT_LINE";
const TCHAR currentColumn[] = TEXT("CURRENT_COLUMN"); const TCHAR currentColumn[] = L"CURRENT_COLUMN";
const TCHAR currentLineStr[] = TEXT("CURRENT_LINESTR"); const TCHAR currentLineStr[] = L"CURRENT_LINESTR";
int whichVar(TCHAR *str); int whichVar(TCHAR *str);
void expandNppEnvironmentStrs(const TCHAR *strSrc, TCHAR *stringDest, size_t strDestLen, HWND hWnd); void expandNppEnvironmentStrs(const TCHAR *strSrc, TCHAR *stringDest, size_t strDestLen, HWND hWnd);

10
PowerEditor/src/WinControls/TabBar/TabBar.cpp
View File

@ -62,7 +62,7 @@ void TabBar::init(HINSTANCE hInst, HWND parent, bool isVertical, bool isMultiLin
_hSelf = ::CreateWindowEx( _hSelf = ::CreateWindowEx(
0, 0,
WC_TABCONTROL, WC_TABCONTROL,
TEXT("Tab"), L"Tab",
style, style,
0, 0, 0, 0, 0, 0, 0, 0,
_hParent, _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; int style = WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_VISIBLE | TCS_FOCUSNEVER | TCS_TABS | vertical | multiLine;
style |= TCS_OWNERDRAWFIXED; 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) if (!_hSelf)
{ {
@ -1145,7 +1145,7 @@ void TabBarPlus::drawItem(DRAWITEMSTRUCT *pDrawItemStruct, bool isDarkMode)
int nTab = pDrawItemStruct->itemID; int nTab = pDrawItemStruct->itemID;
if (nTab < 0) 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)); bool isSelected = (nTab == ::SendMessage(_hSelf, TCM_GETCURSEL, 0, 0));
@ -1385,7 +1385,7 @@ void TabBarPlus::drawItem(DRAWITEMSTRUCT *pDrawItemStruct, bool isDarkMode)
SelectObject(hDC, _hLargeFont); SelectObject(hDC, _hLargeFont);
} }
SIZE charPixel{}; SIZE charPixel{};
::GetTextExtentPoint(hDC, TEXT(" "), 1, &charPixel); ::GetTextExtentPoint(hDC, L" ", 1, &charPixel);
int spaceUnit = charPixel.cx; int spaceUnit = charPixel.cx;
TEXTMETRIC textMetrics{}; TEXTMETRIC textMetrics{};
@ -1462,7 +1462,7 @@ void TabBarPlus::draggingCursor(POINT screenPoint)
{ {
TCHAR className[256] = { '\0' }; TCHAR className[256] = { '\0' };
::GetClassName(hWin, className, 256); ::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) if (::GetKeyState(VK_LCONTROL) & 0x80000000)
::SetCursor(::LoadCursor(_hInst, MAKEINTRESOURCE(IDC_DRAG_PLUS_TAB))); ::SetCursor(::LoadCursor(_hInst, MAKEINTRESOURCE(IDC_DRAG_PLUS_TAB)));

14
PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
View File

@ -67,18 +67,18 @@ ToolbarIconIdUnit toolbarIconIDs[] = {
void ToolBar::initTheme(TiXmlDocument *toolIconsDocRoot) void ToolBar::initTheme(TiXmlDocument *toolIconsDocRoot)
{ {
_toolIcons = toolIconsDocRoot->FirstChild(TEXT("NotepadPlus")); _toolIcons = toolIconsDocRoot->FirstChild(L"NotepadPlus");
if (_toolIcons) if (_toolIcons)
{ {
_toolIcons = _toolIcons->FirstChild(TEXT("ToolBarIcons")); _toolIcons = _toolIcons->FirstChild(L"ToolBarIcons");
if (_toolIcons) if (_toolIcons)
{ {
generic_string iconFolderDir = NppParameters::getInstance().getUserPath(); generic_string iconFolderDir = NppParameters::getInstance().getUserPath();
generic_string toolbarIconsRootFolderName = TEXT("toolbarIcons"); generic_string toolbarIconsRootFolderName = L"toolbarIcons";
pathAppend(iconFolderDir, toolbarIconsRootFolderName); pathAppend(iconFolderDir, toolbarIconsRootFolderName);
generic_string folderName = (_toolIcons->ToElement())->Attribute(TEXT("icoFolderName")); generic_string folderName = (_toolIcons->ToElement())->Attribute(L"icoFolderName");
if (folderName.empty()) if (folderName.empty())
folderName = TEXT("default"); folderName = L"default";
pathAppend(iconFolderDir, folderName); pathAppend(iconFolderDir, folderName);
@ -317,7 +317,7 @@ void ToolBar::reset(bool create)
_hSelf = ::CreateWindowEx( _hSelf = ::CreateWindowEx(
WS_EX_PALETTEWINDOW, WS_EX_PALETTEWINDOW,
TOOLBARCLASSNAME, TOOLBARCLASSNAME,
TEXT(""), L"",
WS_TOOLBARSTYLE | dwExtraStyle, WS_TOOLBARSTYLE | dwExtraStyle,
0, 0, 0, 0,
0, 0, 0, 0,
@ -509,7 +509,7 @@ void ToolBar::doPopop(POINT chevPoint)
else else
AppendMenu(menu, MF_DISABLED|MF_GRAYED, cmd, text.c_str()); AppendMenu(menu, MF_DISABLED|MF_GRAYED, cmd, text.c_str());
} else } else
AppendMenu(menu, MF_SEPARATOR, 0, TEXT("")); AppendMenu(menu, MF_SEPARATOR, 0, L"");
++start; ++start;
} }

4
PowerEditor/src/WinControls/TreeView/TreeView.cpp
View File

@ -32,7 +32,7 @@ void TreeView::init(HINSTANCE hInst, HWND parent, int treeViewID)
_hSelf = CreateWindowEx(0, _hSelf = CreateWindowEx(0,
WC_TREEVIEW, WC_TREEVIEW,
TEXT("Tree View"), L"Tree View",
WS_CHILD | WS_BORDER | treeViewStyles, WS_CHILD | WS_BORDER | treeViewStyles,
0, 0,
0, 0,
@ -138,7 +138,7 @@ LPARAM TreeView::getItemParam(HTREEITEM Item2Get) const
generic_string TreeView::getItemDisplayName(HTREEITEM Item2Set) const generic_string TreeView::getItemDisplayName(HTREEITEM Item2Set) const
{ {
if (!Item2Set) if (!Item2Set)
return TEXT(""); return L"";
TCHAR textBuffer[MAX_PATH] = { '\0' }; TCHAR textBuffer[MAX_PATH] = { '\0' };
TVITEM tvItem{}; TVITEM tvItem{};
tvItem.hItem = Item2Set; tvItem.hItem = Item2Set;

10
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
View File

@ -451,9 +451,9 @@ intptr_t CALLBACK VerticalFileSwitcher::run_dlgProc(UINT message, WPARAM wParam,
Header_GetItem(hwndHD, test->iItem, &hdi); Header_GetItem(hwndHD, test->iItem, &hdi);
// storing column width data // 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; 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; nppParams.getNppGUI()._fileSwitcherPathWidth = hdi.cxy;
return TRUE; return TRUE;
@ -533,9 +533,9 @@ void VerticalFileSwitcher::initPopupMenus()
NativeLangSpeaker* pNativeSpeaker = NppParameters::getInstance().getNativeLangSpeaker(); NativeLangSpeaker* pNativeSpeaker = NppParameters::getInstance().getNativeLangSpeaker();
NppGUI& nppGUI = NppParameters::getInstance().getNppGUI(); NppGUI& nppGUI = NppParameters::getInstance().getNppGUI();
generic_string extStr = pNativeSpeaker->getAttrNameStr(TEXT("Ext."), FS_ROOTNODE, FS_CLMNEXT); generic_string extStr = pNativeSpeaker->getAttrNameStr(L"Ext.", FS_ROOTNODE, FS_CLMNEXT);
generic_string pathStr = pNativeSpeaker->getAttrNameStr(TEXT("Path"), FS_ROOTNODE, FS_CLMNPATH); generic_string pathStr = pNativeSpeaker->getAttrNameStr(L"Path", FS_ROOTNODE, FS_CLMNPATH);
generic_string groupStr = pNativeSpeaker->getAttrNameStr(TEXT("Group by View"), FS_ROOTNODE, FS_LVGROUPS); generic_string groupStr = pNativeSpeaker->getAttrNameStr(L"Group by View", FS_ROOTNODE, FS_LVGROUPS);
_hGlobalMenu = ::CreatePopupMenu(); _hGlobalMenu = ::CreatePopupMenu();
::InsertMenu(_hGlobalMenu, CLMNEXT_ID, MF_BYCOMMAND | MF_STRING, CLMNEXT_ID, extStr.c_str()); ::InsertMenu(_hGlobalMenu, CLMNEXT_ID, MF_BYCOMMAND | MF_STRING, CLMNEXT_ID, extStr.c_str());

10
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp
View File

@ -36,7 +36,7 @@ void VerticalFileSwitcherListView::init(HINSTANCE hInst, HWND parent, HIMAGELIST
| LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | LVS_ALIGNTOP; | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | LVS_ALIGNTOP;
_hSelf = ::CreateWindow(WC_LISTVIEW, _hSelf = ::CreateWindow(WC_LISTVIEW,
TEXT(""), L"",
WS_CHILD | WS_BORDER | listViewStyles, WS_CHILD | WS_BORDER | listViewStyles,
0, 0,
0, 0,
@ -109,16 +109,16 @@ void VerticalFileSwitcherListView::initList()
nameWidth -= nppParams._dpiManager.scaleX(nppParams.getNppGUI()._fileSwitcherPathWidth); nameWidth -= nppParams._dpiManager.scaleX(nppParams.getNppGUI()._fileSwitcherPathWidth);
//add columns //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); insertColumn(nameStr.c_str(), nameWidth, ++colIndex);
if (isExtColumn) 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 insertColumn(extStr.c_str(), nppParams._dpiManager.scaleX(nppParams.getNppGUI()._fileSwitcherExtWidth), ++colIndex); //2nd column
} }
if (isPathColumn) 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 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); size_t nbItem = ListView_GetItemCount(_hSelf);
if (i > nbItem) if (i > nbItem)
return TEXT(""); return L"";
LVITEM item{}; LVITEM item{};
item.mask = LVIF_PARAM; item.mask = LVIF_PARAM;

30
PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
View File

@ -178,7 +178,7 @@ struct BufferEquivalent
s1 = lang1->getLangName(); s1 = lang1->getLangName();
} }
else else
s1 = TEXT(""); s1 = L"";
Lang *lang2 = nppParameters.getLangFromID(b2->getLangType()); Lang *lang2 = nppParameters.getLangFromID(b2->getLangType());
if (lang2) if (lang2)
@ -186,7 +186,7 @@ struct BufferEquivalent
s2 = lang2->getLangName(); s2 = lang2->getLangName();
} }
else else
s2 = TEXT(""); s2 = L"";
int result = _strequiv(s1, s2); 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); int len = lstrlen(fullName)-lstrlen(fileName);
if (!len) { if (!len) {
len = 1; len = 1;
fullName = TEXT(""); fullName = L"";
} }
text.assign(fullName, len); text.assign(fullName, len);
} }
@ -601,23 +601,23 @@ BOOL WindowsDlg::onInitDialog()
generic_string columnText; generic_string columnText;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); 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<TCHAR *>(columnText.c_str()); lvColumn.pszText = const_cast<TCHAR *>(columnText.c_str());
lvColumn.cx = width / 4; lvColumn.cx = width / 4;
SendMessage(_hList, LVM_INSERTCOLUMN, 0, LPARAM(&lvColumn)); 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<TCHAR *>(columnText.c_str()); lvColumn.pszText = const_cast<TCHAR *>(columnText.c_str());
lvColumn.cx = 300; lvColumn.cx = 300;
SendMessage(_hList, LVM_INSERTCOLUMN, 1, LPARAM(&lvColumn)); SendMessage(_hList, LVM_INSERTCOLUMN, 1, LPARAM(&lvColumn));
lvColumn.fmt = LVCFMT_CENTER; 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<TCHAR *>(columnText.c_str()); lvColumn.pszText = const_cast<TCHAR *>(columnText.c_str());
lvColumn.cx = 100; lvColumn.cx = 100;
SendMessage(_hList, LVM_INSERTCOLUMN, 2, LPARAM(&lvColumn)); 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<TCHAR *>(columnText.c_str()); lvColumn.pszText = const_cast<TCHAR *>(columnText.c_str());
lvColumn.cx = 100; lvColumn.cx = 100;
SendMessage(_hList, LVM_INSERTCOLUMN, 3, LPARAM(&lvColumn)); SendMessage(_hList, LVM_INSERTCOLUMN, 3, LPARAM(&lvColumn));
@ -647,7 +647,7 @@ void WindowsDlg::updateColumnNames()
generic_string columnText; generic_string columnText;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); 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) if (_currentColumn != 0)
{ {
columnText = TEXT("⇵ ") + columnText; columnText = TEXT("⇵ ") + columnText;
@ -664,7 +664,7 @@ void WindowsDlg::updateColumnNames()
lvColumn.cx = static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 0, 0)); lvColumn.cx = static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 0, 0));
SendMessage(_hList, LVM_SETCOLUMN, 0, LPARAM(&lvColumn)); 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) if (_currentColumn != 1)
{ {
columnText = TEXT("⇵ ") + columnText; columnText = TEXT("⇵ ") + columnText;
@ -682,7 +682,7 @@ void WindowsDlg::updateColumnNames()
SendMessage(_hList, LVM_SETCOLUMN, 1, LPARAM(&lvColumn)); SendMessage(_hList, LVM_SETCOLUMN, 1, LPARAM(&lvColumn));
lvColumn.fmt = LVCFMT_CENTER; 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) if (_currentColumn != 2)
{ {
columnText = TEXT("⇵ ") + columnText; columnText = TEXT("⇵ ") + columnText;
@ -699,7 +699,7 @@ void WindowsDlg::updateColumnNames()
lvColumn.cx = static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 2, 0)); lvColumn.cx = static_cast<int>(SendMessage(_hList, LVM_GETCOLUMNWIDTH, 2, 0));
SendMessage(_hList, LVM_SETCOLUMN, 2, LPARAM(&lvColumn)); 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) if (_currentColumn != 3)
{ {
columnText = TEXT("⇵ ") + columnText; columnText = TEXT("⇵ ") + columnText;
@ -937,10 +937,10 @@ void WindowsDlg::doCount()
{ {
NativeLangSpeaker* pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); NativeLangSpeaker* pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
generic_string msg = pNativeSpeaker->getAttrNameStr(TEXT("Windows"), "Dialog", "Window", "title"); generic_string msg = pNativeSpeaker->getAttrNameStr(L"Windows", "Dialog", "Window", "title");
msg += TEXT(" - "); msg += L" - ";
msg += pNativeSpeaker->getAttrNameStr(TEXT("Total documents: "), WD_ROOTNODE, WD_NBDOCSTOTAL); msg += pNativeSpeaker->getAttrNameStr(L"Total documents: ", WD_ROOTNODE, WD_NBDOCSTOTAL);
msg += TEXT(" "); msg += L" ";
msg += to_wstring(_idxMap.size()); msg += to_wstring(_idxMap.size());
SetWindowText(_hSelf,msg.c_str()); SetWindowText(_hSelf,msg.c_str());
} }

6
PowerEditor/src/clipboardFormats.h
View File

@ -18,8 +18,8 @@
#ifndef CLIPBOARDFORMATS_H #ifndef CLIPBOARDFORMATS_H
#define CLIPBOARDFORMATS_H #define CLIPBOARDFORMATS_H
#define CF_HTML TEXT("HTML Format") #define CF_HTML L"HTML Format"
#define CF_RTF TEXT("Rich Text Format") #define CF_RTF L"Rich Text Format"
#define CF_NPPTEXTLEN TEXT("Notepad++ Binary Length") #define CF_NPPTEXTLEN L"Notepad++ Binary Length"
#endif //CLIPBOARDFORMATS_H #endif //CLIPBOARDFORMATS_H

188
PowerEditor/src/localizationString.h
View File

@ -17,98 +17,98 @@
LocalizationSwitcher::LocalizationDefinition localizationDefs[] = LocalizationSwitcher::LocalizationDefinition localizationDefs[] =
{ {
{TEXT("English"), TEXT("english.xml")}, {L"English", L"english.xml"},
{TEXT("English (customizable)"), TEXT("english_customizable.xml")}, {L"English (customizable)", L"english_customizable.xml"},
{TEXT("Français"), TEXT("french.xml")}, {L"Français", L"french.xml"},
{TEXT("台灣繁體"), TEXT("taiwaneseMandarin.xml")}, {L"台灣繁體", L"taiwaneseMandarin.xml"},
{TEXT("中文简体"), TEXT("chineseSimplified.xml")}, {L"中文简体", L"chineseSimplified.xml"},
{TEXT("한국어"), TEXT("korean.xml")}, {L"한국어", L"korean.xml"},
{TEXT("日本語"), TEXT("japanese.xml")}, {L"日本語", L"japanese.xml"},
{TEXT("Deutsch"), TEXT("german.xml")}, {L"Deutsch", L"german.xml"},
{TEXT("Español"), TEXT("spanish.xml")}, {L"Español", L"spanish.xml"},
{TEXT("Italiano"), TEXT("italian.xml")}, {L"Italiano", L"italian.xml"},
{TEXT("Português"), TEXT("portuguese.xml")}, {L"Português", L"portuguese.xml"},
{TEXT("Português brasileiro"), TEXT("brazilian_portuguese.xml")}, {L"Português brasileiro", L"brazilian_portuguese.xml"},
{TEXT("Nederlands"), TEXT("dutch.xml")}, {L"Nederlands", L"dutch.xml"},
{TEXT("Русский"), TEXT("russian.xml")}, {L"Русский", L"russian.xml"},
{TEXT("Polski"), TEXT("polish.xml")}, {L"Polski", L"polish.xml"},
{TEXT("Català"), TEXT("catalan.xml")}, {L"Català", L"catalan.xml"},
{TEXT("Česky"), TEXT("czech.xml")}, {L"Česky", L"czech.xml"},
{TEXT("Magyar"), TEXT("hungarian.xml")}, {L"Magyar", L"hungarian.xml"},
{TEXT("Română"), TEXT("romanian.xml")}, {L"Română", L"romanian.xml"},
{TEXT("Türkçe"), TEXT("turkish.xml")}, {L"Türkçe", L"turkish.xml"},
{TEXT("فارسی"), TEXT("farsi.xml")}, {L"فارسی", L"farsi.xml"},
{TEXT("Українська"), TEXT("ukrainian.xml")}, {L"Українська", L"ukrainian.xml"},
{TEXT("עברית"), TEXT("hebrew.xml")}, {L"עברית", L"hebrew.xml"},
{TEXT("Nynorsk"), TEXT("nynorsk.xml")}, {L"Nynorsk", L"nynorsk.xml"},
{TEXT("Norsk"), TEXT("norwegian.xml")}, {L"Norsk", L"norwegian.xml"},
{TEXT("Occitan"), TEXT("occitan.xml")}, {L"Occitan", L"occitan.xml"},
{TEXT("ไทย"), TEXT("thai.xml")}, {L"ไทย", L"thai.xml"},
{TEXT("Furlan"), TEXT("friulian.xml")}, {L"Furlan", L"friulian.xml"},
{TEXT("العربية"), TEXT("arabic.xml")}, {L"العربية", L"arabic.xml"},
{TEXT("Suomi"), TEXT("finnish.xml")}, {L"Suomi", L"finnish.xml"},
{TEXT("Lietuvių"), TEXT("lithuanian.xml")}, {L"Lietuvių", L"lithuanian.xml"},
{TEXT("Ελληνικά"), TEXT("greek.xml")}, {L"Ελληνικά", L"greek.xml"},
{TEXT("Svenska"), TEXT("swedish.xml")}, {L"Svenska", L"swedish.xml"},
{TEXT("Galego"), TEXT("galician.xml")}, {L"Galego", L"galician.xml"},
{TEXT("Slovenščina"), TEXT("slovenian.xml")}, {L"Slovenščina", L"slovenian.xml"},
{TEXT("Slovenčina"), TEXT("slovak.xml")}, {L"Slovenčina", L"slovak.xml"},
{TEXT("Dansk"), TEXT("danish.xml")}, {L"Dansk", L"danish.xml"},
{TEXT("Estremeñu"), TEXT("extremaduran.xml")}, {L"Estremeñu", L"extremaduran.xml"},
{TEXT("Žemaitiu ruoda"), TEXT("samogitian.xml")}, {L"Žemaitiu ruoda", L"samogitian.xml"},
{TEXT("Български"), TEXT("bulgarian.xml")}, {L"Български", L"bulgarian.xml"},
{TEXT("Bahasa Indonesia"), TEXT("indonesian.xml")}, {L"Bahasa Indonesia", L"indonesian.xml"},
{TEXT("Gjuha shqipe"), TEXT("albanian.xml")}, {L"Gjuha shqipe", L"albanian.xml"},
{TEXT("Hrvatski"), TEXT("croatian.xml")}, {L"Hrvatski", L"croatian.xml"},
{TEXT("ქართული ენა"), TEXT("georgian.xml")}, {L"ქართული ენა", L"georgian.xml"},
{TEXT("Euskara"), TEXT("basque.xml")}, {L"Euskara", L"basque.xml"},
{TEXT("Español argentina"), TEXT("spanish_ar.xml")}, {L"Español argentina", L"spanish_ar.xml"},
{TEXT("Беларуская мова"), TEXT("belarusian.xml")}, {L"Беларуская мова", L"belarusian.xml"},
{TEXT("Srpski"), TEXT("serbian.xml")}, {L"Srpski", L"serbian.xml"},
{TEXT("Cрпски"), TEXT("serbianCyrillic.xml")}, {L"Cрпски", L"serbianCyrillic.xml"},
{TEXT("Bahasa Melayu"), TEXT("malay.xml")}, {L"Bahasa Melayu", L"malay.xml"},
{TEXT("Lëtzebuergesch"), TEXT("luxembourgish.xml")}, {L"Lëtzebuergesch", L"luxembourgish.xml"},
{TEXT("Tagalog"), TEXT("tagalog.xml")}, {L"Tagalog", L"tagalog.xml"},
{TEXT("Afrikaans"), TEXT("afrikaans.xml")}, {L"Afrikaans", L"afrikaans.xml"},
{TEXT("Қазақша"), TEXT("kazakh.xml")}, {L"Қазақша", L"kazakh.xml"},
{TEXT("O‘zbekcha"), TEXT("uzbek.xml")}, {L"O‘zbekcha", L"uzbek.xml"},
{TEXT("Ўзбекча"), TEXT("uzbekCyrillic.xml")}, {L"Ўзбекча", L"uzbekCyrillic.xml"},
{TEXT("Кыргыз тили"), TEXT("kyrgyz.xml")}, {L"Кыргыз тили", L"kyrgyz.xml"},
{TEXT("Македонски јазик"), TEXT("macedonian.xml")}, {L"Македонски јазик", L"macedonian.xml"},
{TEXT("latviešu valoda"), TEXT("latvian.xml")}, {L"latviešu valoda", L"latvian.xml"},
{TEXT("தமிழ்"), TEXT("tamil.xml")}, {L"தமிழ்", L"tamil.xml"},
{TEXT("Azərbaycan dili"), TEXT("azerbaijani.xml")}, {L"Azərbaycan dili", L"azerbaijani.xml"},
{TEXT("Bosanski"), TEXT("bosnian.xml")}, {L"Bosanski", L"bosnian.xml"},
{TEXT("Esperanto"), TEXT("esperanto.xml")}, {L"Esperanto", L"esperanto.xml"},
{TEXT("Zeneize"), TEXT("ligurian.xml")}, {L"Zeneize", L"ligurian.xml"},
{TEXT("हिन्दी"), TEXT("hindi.xml")}, {L"हिन्दी", L"hindi.xml"},
{TEXT("Sardu"), TEXT("sardinian.xml")}, {L"Sardu", L"sardinian.xml"},
{TEXT("ئۇيغۇرچە"), TEXT("uyghur.xml")}, {L"ئۇيغۇرچە", L"uyghur.xml"},
{TEXT("తెలుగు"), TEXT("telugu.xml")}, {L"తెలుగు", L"telugu.xml"},
{TEXT("aragonés"), TEXT("aragonese.xml")}, {L"aragonés", L"aragonese.xml"},
{TEXT("বাংলা"), TEXT("bengali.xml")}, {L"বাংলা", L"bengali.xml"},
{TEXT("සිංහල"), TEXT("sinhala.xml")}, {L"සිංහල", L"sinhala.xml"},
{TEXT("Taqbaylit"), TEXT("kabyle.xml")}, {L"Taqbaylit", L"kabyle.xml"},
{TEXT("मराठी"), TEXT("marathi.xml")}, {L"मराठी", L"marathi.xml"},
{TEXT("tiếng Việt"), TEXT("vietnamese.xml")}, {L"tiếng Việt", L"vietnamese.xml"},
{TEXT("Aranés"), TEXT("aranese.xml")}, {L"Aranés", L"aranese.xml"},
{TEXT("ગુજરાતી"), TEXT("gujarati.xml")}, {L"ગુજરાતી", L"gujarati.xml"},
{TEXT("Монгол хэл"), TEXT("mongolian.xml")}, {L"Монгол хэл", L"mongolian.xml"},
{TEXT("اُردُو‎"), TEXT("urdu.xml")}, {L"اُردُو‎", L"urdu.xml"},
{TEXT("ಕನ್ನಡ‎"), TEXT("kannada.xml")}, {L"ಕನ್ನಡ‎", L"kannada.xml"},
{TEXT("Cymraeg"), TEXT("welsh.xml")}, {L"Cymraeg", L"welsh.xml"},
{TEXT("eesti keel"), TEXT("estonian.xml")}, {L"eesti keel", L"estonian.xml"},
{TEXT("Тоҷик"), TEXT("tajikCyrillic.xml")}, {L"Тоҷик", L"tajikCyrillic.xml"},
{TEXT("татарча"), TEXT("tatar.xml")}, {L"татарча", L"tatar.xml"},
{TEXT("ਪੰਜਾਬੀ"), TEXT("punjabi.xml")}, {L"ਪੰਜਾਬੀ", L"punjabi.xml"},
{TEXT("Corsu"), TEXT("corsican.xml")}, {L"Corsu", L"corsican.xml"},
{TEXT("Brezhoneg"), TEXT("breton.xml")}, {L"Brezhoneg", L"breton.xml"},
{TEXT("کوردی‬"), TEXT("kurdish.xml")}, {L"کوردی‬", L"kurdish.xml"},
{TEXT("Pig latin"), TEXT("piglatin.xml")}, {L"Pig latin", L"piglatin.xml"},
{TEXT("Zulu"), TEXT("zulu.xml")}, {L"Zulu", L"zulu.xml"},
{TEXT("Vèneto"), TEXT("venetian.xml")}, {L"Vèneto", L"venetian.xml"},
{TEXT("Gaeilge"), TEXT("irish.xml")}, {L"Gaeilge", L"irish.xml"},
{TEXT("नेपाली"), TEXT("nepali.xml")}, {L"नेपाली", L"nepali.xml"},
{TEXT("香港繁體"), TEXT("hongKongCantonese.xml")}, {L"香港繁體", L"hongKongCantonese.xml"},
{TEXT("Аԥсуа бызшәа"), TEXT("abkhazian.xml")} {L"Аԥсуа бызшәа", L"abkhazian.xml"}
}; };