diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-08-04 01:56:08 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-08-04 01:56:08 -0400 |
| commit | fbd2e43ac377f2f589fb904a7352e8981deda2c7 (patch) | |
| tree | 2ca04e46fd3bb97ce3736c9997e8e2224f9d2928 /Source/Core | |
| parent | 6befa34b609797b4c48dd45b0f0a7adeba8d8a40 (diff) | |
Revert "Fix hotkeys in Linux and Mac OS X"
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 1a43246a36..3310623c2c 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -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(); } |