Cleaning up unicode conversion

This commit is contained in:
kaetemi 2019-05-01 08:17:30 +08:00
parent 605fec7dc8
commit bffb067345
2 changed files with 3 additions and 3 deletions

View file

@ -115,7 +115,7 @@ namespace NLGUI
{ {
#if !FINAL_VERSION #if !FINAL_VERSION
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
ShellExecuteW(NULL, utf8ToWide(operation), utf8ToWide(fileName), utf8ToWide(parameters), NULL, SW_SHOWDEFAULT); ShellExecuteW(NULL, nlUtf8ToWide(operation), nlUtf8ToWide(fileName), nlUtf8ToWide(parameters), NULL, SW_SHOWDEFAULT);
#endif #endif
#endif #endif
} }

View file

@ -764,7 +764,7 @@ void CExportNel::outputErrorMessage(const std::string &message)
{ {
if (_ErrorInDialog) if (_ErrorInDialog)
{ {
MessageBoxW(_Ip->GetMAXHWnd(), utf8ToWide(message), utf8ToWide(_ErrorTitle), MB_OK|MB_ICONEXCLAMATION); MessageBoxW(_Ip->GetMAXHWnd(), nlUtf8ToWide(message), nlUtf8ToWide(_ErrorTitle), MB_OK|MB_ICONEXCLAMATION);
} }
mprintf(_M("%s\n"), MaxTStrFromUtf8(message).data()); mprintf(_M("%s\n"), MaxTStrFromUtf8(message).data());
@ -778,7 +778,7 @@ void CExportNel::outputWarningMessage(const std::string &message)
{ {
if (_ErrorInDialog) if (_ErrorInDialog)
{ {
MessageBoxW(_Ip->GetMAXHWnd(), utf8ToWide(message), utf8ToWide(_ErrorTitle), MB_OK|MB_ICONEXCLAMATION); MessageBoxW(_Ip->GetMAXHWnd(), nlUtf8ToWide(message), nlUtf8ToWide(_ErrorTitle), MB_OK|MB_ICONEXCLAMATION);
} }
mprintf(_M("%s\n"), MaxTStrFromUtf8(message).data()); mprintf(_M("%s\n"), MaxTStrFromUtf8(message).data());