archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add back fused gui log classes, this needs to be redone another way

Browse source 
also, add back wx requirement for strfmt
This commit is contained in:
Peter Tissen 2014-06-08 23:02:20 +02:00
parent 10e10de98d
commit ed10ea7544
12 changed files with 332 additions and 333 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Utilities/StrFmt.cpp
View file

@ -54,23 +54,22 @@ std::string replace_all(std::string src, const std::string& from, const std::str
return src;
}
//#ifdef wxGUI
////convert a wxString to a std::string encoded in utf8
////CAUTION, only use this to interface with wxWidgets classes
//std::string fmt::ToUTF8(const wxString& right)
//{
// auto ret = std::string(((const char *) right.utf8_str()));
// return ret;
//}
//
////convert a std::string encoded in utf8 to a wxString
////CAUTION, only use this to interface with wxWidgets classes
//wxString fmt::FromUTF8(const std::string& right)
//{
// auto ret = wxString::FromUTF8(right.c_str());
// return ret;
//}
//#endif
//TODO: move this wx Stuff somewhere else
//convert a wxString to a std::string encoded in utf8
//CAUTION, only use this to interface with wxWidgets classes
std::string fmt::ToUTF8(const wxString& right)
{
auto ret = std::string(((const char *)right.utf8_str()));
return ret;
}
//convert a std::string encoded in utf8 to a wxString
//CAUTION, only use this to interface with wxWidgets classes
wxString fmt::FromUTF8(const std::string& right)
{
auto ret = wxString::FromUTF8(right.c_str());
return ret;
}
//TODO: remove this after every snippet that uses it is gone
//WARNING: not fully compatible with CmpNoCase from wxString