mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 05:47:56 -07:00
Merge pull request #5628 from JosJuice/updatetitle-encoding
DolphinWX: Fix encoding errors in UpdateTitle
This commit is contained in:
commit
10beb2aea1
@ -747,17 +747,17 @@ void CFrame::UninhibitScreensaver()
|
||||
#endif
|
||||
}
|
||||
|
||||
void CFrame::UpdateTitle(const std::string& str)
|
||||
void CFrame::UpdateTitle(const wxString& str)
|
||||
{
|
||||
const wxString revision_string = StrToWxStr(scm_rev_str);
|
||||
if (SConfig::GetInstance().bRenderToMain && SConfig::GetInstance().m_InterfaceStatusbar)
|
||||
{
|
||||
GetStatusBar()->SetStatusText(str, 0);
|
||||
m_render_frame->SetTitle(scm_rev_str);
|
||||
m_render_frame->SetTitle(revision_string);
|
||||
}
|
||||
else
|
||||
{
|
||||
std::string titleStr = StringFromFormat("%s | %s", scm_rev_str.c_str(), str.c_str());
|
||||
m_render_frame->SetTitle(titleStr);
|
||||
m_render_frame->SetTitle(revision_string + StrToWxStr(" | ") + str);
|
||||
}
|
||||
}
|
||||
|
||||
@ -780,7 +780,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
|
||||
break;
|
||||
|
||||
case IDM_UPDATE_TITLE:
|
||||
UpdateTitle(WxStrToStr(event.GetString()));
|
||||
UpdateTitle(event.GetString());
|
||||
break;
|
||||
|
||||
case IDM_WINDOW_SIZE_REQUEST:
|
||||
|
@ -14,6 +14,7 @@
|
||||
#include <wx/frame.h>
|
||||
#include <wx/image.h>
|
||||
#include <wx/panel.h>
|
||||
#include <wx/string.h>
|
||||
#include <wx/timer.h>
|
||||
|
||||
#include "Common/CommonTypes.h"
|
||||
@ -254,7 +255,7 @@ private:
|
||||
bool TriggerSTMPowerEvent();
|
||||
void OnStopped();
|
||||
void OnRenderWindowSizeRequest(int width, int height);
|
||||
void UpdateTitle(const std::string& str);
|
||||
void UpdateTitle(const wxString& str);
|
||||
static void ConnectWiimote(int wm_idx, bool connect);
|
||||
|
||||
// Event functions
|
||||
|
Loading…
Reference in New Issue
Block a user