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

Merge pull request #2096 from lioncash/wx 

DolphinWX: Remove unnecessary Windows-specific code in Frame.cpp
This commit is contained in:
skidau 2015-02-24 13:11:39 +11:00
parent bf61abf22b d48ad19b8d
commit 69381580f3
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/Frame.cpp
View File

@ -577,13 +577,7 @@ void CFrame::OnActive(wxActivateEvent& event)
if (event.GetActive() && event.GetEventObject() == m_RenderFrame) if (event.GetActive() && event.GetEventObject() == m_RenderFrame)
{ {
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
{
#ifdef __WXMSW__
::SetFocus((HWND)m_RenderParent->GetHandle());
#else
m_RenderParent->SetFocus(); m_RenderParent->SetFocus();
#endif
}
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
Core::GetState() == Core::CORE_RUN) Core::GetState() == Core::CORE_RUN)