mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-18 11:42:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PadSimple and Wiimote: Change to last commit, changed the ifdef since IsFocus() was already in an ifdef

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2061 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-02-01 15:58:33 +00:00
parent 9f20ee78f9
commit ad995a68ea
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
View File

@ -114,13 +114,12 @@ bool IsFocus()
HWND TopLevel = GetParent(Parent); HWND TopLevel = GetParent(Parent);
// Support both rendering to main window and not // Support both rendering to main window and not
if (GetForegroundWindow() == TopLevel || GetForegroundWindow() == g_PADInitialize.hWnd) if (GetForegroundWindow() == TopLevel || GetForegroundWindow() == g_PADInitialize.hWnd)
#else
// Todo: Fix the render to main window option in non-Windows to?
if (GetForegroundWindow() == g_PADInitialize.hWnd)
#endif
return true; return true;
else else
return false; return false;
#else
return false;
#endif
} }

4
Source/Plugins/Plugin_Wiimote/Src/main.cpp
View File

@ -339,6 +339,7 @@ extern "C" unsigned int Wiimote_GetAttachedControllers()
// Check if Dolphin is in focus // Check if Dolphin is in focus
bool IsFocus() bool IsFocus()
{ {
#ifdef _WIN32
HWND Parent = GetParent(g_WiimoteInitialize.hWnd); HWND Parent = GetParent(g_WiimoteInitialize.hWnd);
HWND TopLevel = GetParent(Parent); HWND TopLevel = GetParent(Parent);
// Support both rendering to main window and not // Support both rendering to main window and not
@ -346,6 +347,9 @@ bool IsFocus()
return true; return true;
else else
return false; return false;
#else
return false;
#endif
} }
void ReadDebugging(bool Emu, const void* _pData) void ReadDebugging(bool Emu, const void* _pData)