RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-07 07:25:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

use .wx_str() instead of .mb_str(), Dbg console is still broken

Browse source
This commit is contained in:
Peter Tissen 2014-02-10 13:53:09 +01:00
parent fdcdd7769f
commit b9c3dc352d
32 changed files with 216 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

49
rpcs3/Gui/ConLog.cpp
View file

@ -148,22 +148,22 @@ void LogWriter::WriteToLog(std::string prefix, std::string value, std::string co
LogBuffer.Push(LogPacket(prefix, value, colour));
}
wxString FormatV(const wxString fmt, va_list args)
{
int length = 256;
wxString str;
for(;;)
{
str.Clear();
wxStringBuffer buf(str, length+1);
memset(buf, 0, length+1);
if(vsnprintf((char *)((wxStringCharType *)buf), length, fmt, args) != -1) break;
length *= 2;
}
return str;
}
//wxString FormatV(const wxString fmt, va_list args)
//{
// int length = 256;
// wxString str;
//
// for(;;)
// {
// str.Clear();
// wxStringBuffer buf(str, length+1);
// memset(buf, 0, length+1);
// if(vsnprintf((char *)((wxStringCharType *)buf), length, fmt, args) != -1) break;
// length *= 2;
// }
//
// return str;
//}
void LogWriter::Write(const wxString fmt, ...)
{
@ -175,7 +175,7 @@ void LogWriter::Write(const wxString fmt, ...)
va_end(list);
WriteToLog("!", (const char *)frmt.mb_str(), "White");
WriteToLog("!", static_cast<const char *>(frmt), "White");
}
void LogWriter::Error(const wxString fmt, ...)
@ -183,11 +183,12 @@ void LogWriter::Error(const wxString fmt, ...)
va_list list;
va_start(list, fmt);
const wxString& frmt = FormatV(fmt, list);
wxString frmt;
frmt.PrintfV(fmt, list);
va_end(list);
WriteToLog("E", (const char *)frmt.mb_str(), "Red");
WriteToLog("E", static_cast<const char *>(frmt), "Red");
}
void LogWriter::Warning(const wxString fmt, ...)
@ -195,11 +196,12 @@ void LogWriter::Warning(const wxString fmt, ...)
va_list list;
va_start(list, fmt);
const wxString& frmt = FormatV(fmt, list);
wxString frmt;
frmt.PrintfV(fmt, list);
va_end(list);
WriteToLog("W", (const char *)frmt.mb_str(), "Yellow");
WriteToLog("W", static_cast<const char *>(frmt), "Yellow");
}
void LogWriter::Success(const wxString fmt, ...)
@ -207,11 +209,12 @@ void LogWriter::Success(const wxString fmt, ...)
va_list list;
va_start(list, fmt);
const wxString& frmt = FormatV(fmt, list);
wxString frmt;
frmt.PrintfV(fmt, list);
va_end(list);
WriteToLog("S", (const char *)frmt.mb_str(), "Green");
WriteToLog("S", static_cast<const char *>(frmt), "Green");
}
void LogWriter::SkipLn()