ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jules Blok 2014-06-15 12:02:55 +02:00
parent 2c8393c899
commit 1b70bebb5a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Frame.h
View File

@ -177,7 +177,7 @@ private:
CGameListCtrl* m_GameListCtrl; CGameListCtrl* m_GameListCtrl;
wxPanel* m_Panel; wxPanel* m_Panel;
CRenderFrame* m_RenderFrame; CRenderFrame* m_RenderFrame;
wxPanel* m_RenderParent; wxWindow* m_RenderParent;
CLogWindow* m_LogWindow; CLogWindow* m_LogWindow;
LogConfigWindow* m_LogConfigWindow; LogConfigWindow* m_LogConfigWindow;
FifoPlayerDlg* m_FifoPlayerDlg; FifoPlayerDlg* m_FifoPlayerDlg;

2
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -976,7 +976,7 @@ void CFrame::StartGame(const std::string& filename)
m_RenderFrame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnRenderParentClose, this); m_RenderFrame->Bind(wxEVT_CLOSE_WINDOW, &CFrame::OnRenderParentClose, this);
m_RenderFrame->Bind(wxEVT_ACTIVATE, &CFrame::OnActive, this); m_RenderFrame->Bind(wxEVT_ACTIVATE, &CFrame::OnActive, this);
m_RenderFrame->Bind(wxEVT_MOVE, &CFrame::OnRenderParentMove, this); m_RenderFrame->Bind(wxEVT_MOVE, &CFrame::OnRenderParentMove, this);
m_RenderParent = new CPanel(m_RenderFrame, wxID_ANY); m_RenderParent = m_RenderFrame;
m_RenderFrame->Show(); m_RenderFrame->Show();
} }