diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-09-19 20:48:27 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-09-19 20:48:27 -0500 |
| commit | 2db7413a1953d6ebac301e115e5e82fc9ea1a875 (patch) | |
| tree | c1385a80b37017b3ef24490e223a7b334eec6420 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | eb238823985121531d5b659dc5b45b8086b38a1e (diff) | |
| parent | c33a9de6affd139b7a9b7133f7d0d134ec466e32 (diff) | |
Merge pull request #1118 from lioncash/lolwinapi
FrameTools: Set focus on Windows via CFrame::SetFocus
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index e6a9aaad17..90254c9a14 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -973,11 +973,7 @@ void CFrame::StartGame(const std::string& filename) X11Utils::XWindowFromHandle(GetHandle()), true); #endif -#ifdef _WIN32 - ::SetFocus((HWND)m_RenderParent->GetHandle()); -#else m_RenderParent->SetFocus(); -#endif wxTheApp->Bind(wxEVT_KEY_DOWN, &CFrame::OnKeyDown, this); wxTheApp->Bind(wxEVT_KEY_UP, &CFrame::OnKeyUp, this); |