mirror of
https://github.com/4ian/GDevelop.git
synced 2025-10-15 10:19:04 +00:00
Merge branch 'utf8' of https://github.com/victorlevasseur/GD into utf8
This commit is contained in:
@@ -21,12 +21,20 @@ namespace utf8
|
||||
|
||||
std::string GD_CORE_API FromLocaleString( const std::string &str )
|
||||
{
|
||||
#if defined(WINDOWS)
|
||||
return FromSfString(sf::String(str));
|
||||
#else
|
||||
return str; //UTF8 is already the current locale on Linux
|
||||
#endif
|
||||
}
|
||||
|
||||
std::string GD_CORE_API ToLocaleString( const std::string &utf8str )
|
||||
{
|
||||
#if defined(WINDOWS)
|
||||
return ToSfString(utf8str).toAnsiString();
|
||||
#else
|
||||
return utf8str; //UTF8 is already the current locale on Linux
|
||||
#endif
|
||||
}
|
||||
|
||||
#if defined(GD_IDE_ONLY) && !defined(GD_NO_WX_GUI)
|
||||
|
@@ -18,12 +18,20 @@ namespace utf8
|
||||
|
||||
std::string GD_API FromLocaleString( const std::string &str )
|
||||
{
|
||||
#if defined(WINDOWS)
|
||||
return FromSfString(sf::String(str));
|
||||
#else
|
||||
return str; //UTF8 is already the current locale on Linux
|
||||
#endif
|
||||
}
|
||||
|
||||
std::string GD_API ToLocaleString( const std::string &utf8str )
|
||||
{
|
||||
#if defined(WINDOWS)
|
||||
return ToSfString(utf8str).toAnsiString();
|
||||
#else
|
||||
return utf8str; //UTF8 is already the current locale on Linux
|
||||
#endif
|
||||
}
|
||||
|
||||
#if defined(GD_IDE_ONLY) && !defined(GD_NO_WX_GUI)
|
||||
|
Reference in New Issue
Block a user