ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Windows] Fix remaining UTF-8 issues. 

We were missing some `wxConvLibc` on the output code. This meant crappy
messages on windows.
This commit is contained in:
Edênis Freindorfer Azevedo 2019-09-10 15:21:52 -03:00 committed by Rafael Kitover
parent a2f3126e17
commit 1c6b016853
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wx/sys.cpp
View File

@ -69,7 +69,7 @@ void systemMessage(int id, const char* fmt, ...)
exit(1); exit(1);
} }
wxLogError(wxT("%s"), wxString(buf, wxConvLibc).c_str()); wxLogError(wxT("%s"), wxString(buf, wxConvUTF8).c_str());
} }
static int frames = 0; static int frames = 0;
@ -1044,7 +1044,7 @@ void systemScreenMessage(const wxString& msg)
void systemScreenMessage(const char* msg) void systemScreenMessage(const char* msg)
{ {
systemScreenMessage(wxString(msg, wxConvLibc)); systemScreenMessage(wxString(msg, wxConvUTF8));
} }
bool systemCanChangeSoundQuality() bool systemCanChangeSoundQuality()
@ -1185,7 +1185,7 @@ bool debugOpenPty()
if ((pty_master = posix_openpt(O_RDWR | O_NOCTTY)) < 0 || grantpt(pty_master) < 0 || unlockpt(pty_master) < 0 || !(slave_name = ptsname(pty_master))) { if ((pty_master = posix_openpt(O_RDWR | O_NOCTTY)) < 0 || grantpt(pty_master) < 0 || unlockpt(pty_master) < 0 || !(slave_name = ptsname(pty_master))) {
wxLogError(_("Error opening pseudo tty: %s"), wxString(strerror(errno), wxLogError(_("Error opening pseudo tty: %s"), wxString(strerror(errno),
wxConvLibc) wxConvUTF8)
.c_str()); .c_str());
if (pty_master >= 0) { if (pty_master >= 0) {
@ -1196,7 +1196,7 @@ bool debugOpenPty()
return false; return false;
} }
pty_slave = wxString(slave_name, wxConvLibc); pty_slave = wxString(slave_name, wxConvUTF8);
remoteSendFnc = debugWritePty; remoteSendFnc = debugWritePty;
remoteRecvFnc = debugReadPty; remoteRecvFnc = debugReadPty;
remoteCleanUpFnc = debugClosePty; remoteCleanUpFnc = debugClosePty;
@ -1308,7 +1308,7 @@ void log(const char* defaultMsg, ...)
char buf[2048]; char buf[2048];
va_start(valist, defaultMsg); va_start(valist, defaultMsg);
vsnprintf(buf, 2048, defaultMsg, valist); vsnprintf(buf, 2048, defaultMsg, valist);
wxString msg = wxString(buf, wxConvLibc); wxString msg = wxString(buf, wxConvUTF8);
va_end(valist); va_end(valist);
wxGetApp().log.append(msg); wxGetApp().log.append(msg);