Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #732 from dolphin-emu/revert-683-linux_hotkeys
Revert "Fix hotkeys in Linux and Mac OS X"
  • Loading branch information
lioncash committed Aug 4, 2014
2 parents 6befa34 + fbd2e43 commit 5891ff1
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions Source/Core/DolphinWX/FrameTools.cpp
Expand Up @@ -968,16 +968,12 @@ 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 5891ff1

Please sign in to comment.