mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
GUIHyperText: Fix bug with UTF8 chars in action name + simplify UTF8 stringw conversion (#9437)
Co-authored-by: Pierre-Yves Rollo <dev@pyrollo.com>
This commit is contained in:
parent
ce8cdc0333
commit
0e88176db8
3 changed files with 22 additions and 39 deletions
|
@ -860,28 +860,3 @@ std::wstring translate_string(const std::wstring &s) {
|
|||
translate_all(s, i, res);
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a std::string from a irr::core:stringw.
|
||||
*/
|
||||
std::string strwtostr(const irr::core::stringw &str)
|
||||
{
|
||||
std::string text = core::stringc(str.c_str()).c_str();
|
||||
return text;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a irr::core:stringw from a std::string.
|
||||
*/
|
||||
irr::core::stringw strtostrw(const std::string &str)
|
||||
{
|
||||
size_t size = str.size();
|
||||
// s.size() doesn't include NULL terminator
|
||||
wchar_t *text = new wchar_t[size + sizeof(wchar_t)];
|
||||
const char *data = &str[0];
|
||||
|
||||
mbsrtowcs(text, &data, size, NULL);
|
||||
|
||||
text[size] = L'\0';
|
||||
return text;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue