diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-08-14 15:27:21 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-08-14 15:27:21 +0200 |
| commit | 7b6b9b09451beede40661eebea012617e59fc46d (patch) | |
| tree | 59c3507aea92f20c321d6e49647f1d9bdedd052b /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | e5ca4f604ce4696319b74012bb476889e7f099aa (diff) | |
| parent | 9818bd3edfb9399e956b949245c756724be8c2da (diff) | |
Merge pull request #735 from Armada651/d3dfullscreen_fixes
Fix hotkeys in Linux and Mac OS X (properly this time).
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 0baa25983a..4e21da1ad6 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -949,7 +949,14 @@ void CFrame::StartGame(const std::string& filename) m_RenderFrame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnRenderParentClose, this); m_RenderFrame->Bind(wxEVT_ACTIVATE, &CFrame::OnActive, this); m_RenderFrame->Bind(wxEVT_MOVE, &CFrame::OnRenderParentMove, this); +#ifdef _WIN32 + // The renderer should use a top-level window for exclusive fullscreen support. m_RenderParent = m_RenderFrame; +#else + // To capture key events on Linux and Mac OS X the frame needs at least one child. + m_RenderParent = new wxPanel(m_RenderFrame, IDM_MPANEL, wxDefaultPosition, wxDefaultSize, 0); +#endif + m_RenderFrame->Show(); } |