diff options
Diffstat (limited to 'Source/Core')
| -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(); } |