diff options
| author | Jules Blok <jules.blok@gmail.com> | 2014-06-15 12:02:55 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2014-07-19 15:56:49 +0200 |
| commit | 1b70bebb5a67bce1482db0ff9e155e72e9c62056 (patch) | |
| tree | 1e39edc8b4b4788cd2af2eb6ec4c6899f6b89a59 /Source | |
| parent | 2c8393c899f7be2a38cbc1e9808431ec66de6cba (diff) | |
Don't create a Panel for a seperate render window.
Instead of setting RenderParent to null and raising complexity RenderFrame can be its own parent.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.h | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index 900753174e..d4024c8c22 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -177,7 +177,7 @@ private: CGameListCtrl* m_GameListCtrl; wxPanel* m_Panel; CRenderFrame* m_RenderFrame; - wxPanel* m_RenderParent; + wxWindow* m_RenderParent; CLogWindow* m_LogWindow; LogConfigWindow* m_LogConfigWindow; FifoPlayerDlg* m_FifoPlayerDlg; diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index b33cd4bab1..1885ddb55e 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -976,7 +976,7 @@ 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); - m_RenderParent = new CPanel(m_RenderFrame, wxID_ANY); + m_RenderParent = m_RenderFrame; m_RenderFrame->Show(); } |