Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #735 from Armada651/d3dfullscreen_fixes
Fix hotkeys in Linux and Mac OS X (properly this time).
  • Loading branch information
delroth committed Aug 14, 2014
2 parents e5ca4f6 + 9818bd3 commit 7b6b9b0
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Source/Core/DolphinWX/FrameTools.cpp
Expand Up @@ -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();
}

Expand Down

0 comments on commit 7b6b9b0

Please sign in to comment.