mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-11-16 11:04:28 +01:00
wx: Remove wxString implicit constructor from std::string
On windows, it uses the current system's character encoding instead of utf-8, which breaks a lot of things. We should avoid it.
This commit is contained in:
1 parent
162a0bbe46
commit
cbcd9b5004
26 files changed
+100
-55
No files matched your search
@@ -274,7 +274,7 @@ void IniLoader::Entry(const wxString& var, std::string& value, const std::string
|
||||
if (m_Config)
|
||||
{
|
||||
wxString temp;
|
||||
m_Config->Read(var, &temp, wxString(default_value));
|
||||
m_Config->Read(var, &temp, fromUTF8(default_value));
|
||||
value = temp.ToStdString();
|
||||
}
|
||||
else if (&value != &default_value)
|
||||
@@ -443,5 +443,5 @@ void IniSaver::Entry(const wxString& var, std::string& value, const std::string&
|
||||
{
|
||||
if (!m_Config)
|
||||
return;
|
||||
m_Config->Write(var, wxString(value));
|
||||
m_Config->Write(var, fromUTF8(value));
|
||||
}
|
||||
Reference in new issue
Block a user