From ad995a68ea1ff497fc002f23db833d0e9345b1ae Mon Sep 17 00:00:00 2001 From: John Peterson Date: Sun, 1 Feb 2009 15:58:33 +0000 Subject: [PATCH] PadSimple and Wiimote: Change to last commit, changed the ifdef since IsFocus() was already in an ifdef git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2061 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp | 7 +++---- Source/Plugins/Plugin_Wiimote/Src/main.cpp | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index a90fae177f..7f2eec588c 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -114,13 +114,12 @@ bool IsFocus() HWND TopLevel = GetParent(Parent); // Support both rendering to main window and not 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; else return false; +#else + return false; +#endif } diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp index 92d7354634..42c71ab23e 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp @@ -339,6 +339,7 @@ extern "C" unsigned int Wiimote_GetAttachedControllers() // Check if Dolphin is in focus bool IsFocus() { +#ifdef _WIN32 HWND Parent = GetParent(g_WiimoteInitialize.hWnd); HWND TopLevel = GetParent(Parent); // Support both rendering to main window and not @@ -346,6 +347,9 @@ bool IsFocus() return true; else return false; +#else + return false; +#endif } void ReadDebugging(bool Emu, const void* _pData)