From 0e466300dcc9212667187383aab89ff29f05e40f Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Mon, 20 Dec 2010 17:36:51 +0000 Subject: [PATCH] On OS X, we claim all keyboard events while emulation is running to avoid wxWidgets sounding the system beep for unhandled key events when receiving pad/wiimote keypresses separately from HID devices. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6630 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/Frame.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index c18459df54..0bb43dabd6 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -807,7 +807,15 @@ void CFrame::OnKeyDown(wxKeyEvent& event) event.Skip(); } else +#ifdef __APPLE__ + // We claim all keyboard events while emulation is + // running to avoid wxWidgets sounding the system beep + // for unhandled key events when receiving pad/wiimote + // keypresses separately from HID devices. + return; +#else event.Skip(); +#endif // Actually perform the wiimote connection or disconnection if (WiimoteId >= 0)