fix wxw multibyte text issues in netplay. changes by bhaal.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4725 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2009-12-23 20:46:56 +00:00
parent 9eea60ca69
commit 62b6af3259
3 changed files with 13 additions and 13 deletions

View File

@ -359,9 +359,9 @@ void NetPlay::UpdateNetWindow(bool update_infos, wxString infos)
SplitString(std::string(infos.mb_str()), "x", str_arr);
m_ConInfo_text->SetLabel
(wxString::Format(wxT(" Fps : %s | Ping : %s | Frame Delay : %s"),
(wxString::FromAscii(StringFromFormat(" Fps : %s | Ping : %s | Frame Delay : %s",
str_arr[0].c_str(), str_arr[1].c_str(),
str_arr[2].c_str()) );
str_arr[2].c_str()).c_str()) );
}
else
{
@ -468,7 +468,7 @@ void NetPlay::OnGUIEvent(wxCommandEvent& event)
{
value = 0x30;
// TODO : there seems to be a random bug here that i can't reproduce... looked like a loop bug :/
wxString chat_str = wxString::Format(wxT("> %s : %s\n"), wxString(m_nick.c_str(), wxConvUTF8).c_str() , m_Chat->GetValue().c_str() );
wxString chat_str = wxString::FromAscii(StringFromFormat("> %s : %s\n", m_nick.c_str(), m_Chat->GetValue().c_str()).c_str() );
int chat_size = (int)chat_str.size();
if(chat_size-m_nick.size()-6 > 0)
{