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

It would appear that FindFocus() is (differently) broken on Windows. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5803 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-06-26 18:50:22 +00:00
parent b372fe4329
commit 9de9ec1fb6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -740,12 +740,14 @@ void CFrame::OnSizeRequest(int& x, int& y, int& width, int& height)
bool CFrame::RendererHasFocus() bool CFrame::RendererHasFocus()
{ {
if (m_RenderParent == NULL || wxWindow::FindFocus() == NULL) if (m_RenderParent == NULL)
return false; return false;
#ifdef _WIN32 #ifdef _WIN32
if (m_RenderParent->GetParent()->GetHWND() == GetForegroundWindow()) if (m_RenderParent->GetParent()->GetHWND() == GetForegroundWindow())
return true; return true;
#else #else
if (wxWindow::FindFocus() == NULL)
return false;
// Why these different cases? // Why these different cases?
if (m_RenderParent == wxWindow::FindFocus() || if (m_RenderParent == wxWindow::FindFocus() ||
m_RenderParent == wxWindow::FindFocus()->GetParent() || m_RenderParent == wxWindow::FindFocus()->GetParent() ||