diff options
| author | sl1nk3.s <sl1nk3.s@gmail.com> | 2009-12-30 15:08:18 +0000 |
|---|---|---|
| committer | sl1nk3.s <sl1nk3.s@gmail.com> | 2009-12-30 15:08:18 +0000 |
| commit | 18e951f97ac7e0fb7cbd3dad775577eee3a33396 (patch) | |
| tree | f6915877daf5f2ed6d136ec1fa5f16a012c23f2a /Source/Core | |
| parent | 151ff28ab7dd1fd0343587f194bf8620d5fc3620 (diff) | |
Fix a crash when closing DirectX's window, also apply a fix from j4ck.fr0st/BhaaL @ issue 1277 to prevent two possibles hang on stop.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4756 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameAui.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp index 42c5bfcd8d..a3c7914f22 100644 --- a/Source/Core/DolphinWX/Src/FrameAui.cpp +++ b/Source/Core/DolphinWX/Src/FrameAui.cpp @@ -661,10 +661,10 @@ void CFrame::ResetToolbarStyle() void CFrame::TogglePaneStyle(bool On, int EventId) { - wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes(); - for (u32 i = 0; i < AllPanes.GetCount(); ++i) - { - wxAuiPaneInfo& Pane = AllPanes.Item(i); + wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes(); + for (u32 i = 0; i < AllPanes.GetCount(); ++i) + { + wxAuiPaneInfo& Pane = AllPanes.Item(i); if (Pane.window->IsKindOf(CLASSINFO(wxAuiNotebook))) { // Default @@ -685,28 +685,28 @@ void CFrame::TogglePaneStyle(bool On, int EventId) } Pane.Dockable(!m_bNoDocking); } - } + } m_Mgr->Update(); } void CFrame::ToggleNotebookStyle(bool On, long Style) { - wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes(); - for (int i = 0, Count = (int)AllPanes.GetCount(); i < Count; ++i) - { - wxAuiPaneInfo& Pane = AllPanes.Item(i); - if (Pane.window->IsKindOf(CLASSINFO(wxAuiNotebook))) - { - wxAuiNotebook* NB = (wxAuiNotebook*)Pane.window; + wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes(); + for (int i = 0, Count = (int)AllPanes.GetCount(); i < Count; ++i) + { + wxAuiPaneInfo& Pane = AllPanes.Item(i); + if (Pane.window->IsKindOf(CLASSINFO(wxAuiNotebook))) + { + wxAuiNotebook* NB = (wxAuiNotebook*)Pane.window; if (On) NB->SetWindowStyleFlag(NB->GetWindowStyleFlag() | Style); else NB->SetWindowStyleFlag(NB->GetWindowStyleFlag() &~ Style); - NB->Refresh(); - } - } + NB->Refresh(); + } + } } void CFrame::OnSelectPerspective(wxCommandEvent& event) { |