From 9818bd3edfb9399e956b949245c756724be8c2da Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Mon, 4 Aug 2014 13:02:19 +0200 Subject: [PATCH] CFrame: Render to a child on Linux and Mac OS X. This is needed to fix the hotkeys on those platforms. --- Source/Core/DolphinWX/FrameTools.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 3310623c2c..e1beb095d2 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -973,7 +973,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(); }