piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Hopefully fixed "RendererHasFocus()" on windows. Input should work again.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5359 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-04-13 20:02:48 +00:00
parent 578828a142
commit 387aba7a6c
5 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -757,8 +757,10 @@ bool CFrame::RendererHasFocus()
#ifdef _WIN32
// Why doesn't the "else" method below work in windows when called from
// Host_RendererHasFocus()?
bRendererHasFocus = m_RenderParent && (m_RenderParent == wxWindow::FindFocus());
return bRendererHasFocus;
if (m_RenderParent)
if (m_RenderParent->GetParent()->GetHWND() == GetForegroundWindow())
return true;
return false;
#else
return m_RenderParent && (m_RenderParent == wxWindow::FindFocus());
#endif

3
Source/Core/DolphinWX/Src/Frame.h
View File

@ -103,9 +103,6 @@ class CFrame : public wxFrame
void DoPause();
void DoStop();
bool bRenderToMain;
#ifdef _WIN32
bool bRendererHasFocus;
#endif
bool bNoWiimoteMsg;
void UpdateGUI();
void ToggleLogWindow(bool, int i = -1);

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

@ -677,9 +677,5 @@ void Host_SetWiiMoteConnectionState(int _State)
bool Host_RendererHasFocus()
{
#ifdef _WIN32
return main_frame->bRendererHasFocus;
#else
return main_frame->RendererHasFocus();
#endif
}