Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #683 from Armada651/linux_hotkeys
Fix hotkeys in Linux and Mac OS X
  • Loading branch information
lioncash committed Aug 4, 2014
2 parents ee7b861 + 6ab6d07 commit d8d99f9
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Source/Core/DolphinWX/FrameTools.cpp
Expand Up @@ -970,12 +970,16 @@ void CFrame::StartGame(const std::string& filename)
else
m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP);

m_RenderFrame->SetBackgroundColour(*wxBLACK);
m_RenderFrame->SetClientSize(size.GetWidth(), size.GetHeight());
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);
m_RenderParent = m_RenderFrame;

// To capture key events the frame needs at least one child.
wxPanel* panel = new wxPanel(m_RenderFrame, IDM_MPANEL, wxDefaultPosition, wxDefaultSize, 0);
panel->SetBackgroundColour(*wxBLACK);

m_RenderFrame->Show();
}

Expand Down

0 comments on commit d8d99f9

Please sign in to comment.