diff options
| author | Markus Wick <markus@selfnet.de> | 2015-07-20 13:55:05 +0200 |
|---|---|---|
| committer | Markus Wick <markus@selfnet.de> | 2015-07-20 13:55:05 +0200 |
| commit | b5fe028e185402835b86003183e61c0a2b26b6bf (patch) | |
| tree | 2b2ca724caa122fb4b425497bbdedab5309e00c5 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | da38e3a8ae7be05ca783e72f0bce821dc23646bd (diff) | |
| parent | ccb56ddf97dded3af5b2d6e3a41367f56ca7d672 (diff) | |
Merge pull request #2752 from Armada651/osx-beep
CFrame: Claim all keyboard events on OS X.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index d56a8486b2..a54677423d 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1046,6 +1046,7 @@ void CFrame::StartGame(const std::string& filename) m_RenderParent->SetFocus(); + wxTheApp->Bind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this); wxTheApp->Bind(wxEVT_RIGHT_DOWN, &CFrame::OnMouse, this); wxTheApp->Bind(wxEVT_RIGHT_UP, &CFrame::OnMouse, this); wxTheApp->Bind(wxEVT_MIDDLE_DOWN, &CFrame::OnMouse, this); |