check if pane still exists before closing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1092,8 +1092,7 @@ bool wxAuiManager::DetachPane(wxWindow* window)
|
||||
return false;
|
||||
}
|
||||
|
||||
// ClosePane() destroys or hides the pane depending on its
|
||||
// flags
|
||||
// ClosePane() destroys or hides the pane depending on its flags
|
||||
void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info)
|
||||
{
|
||||
// if we were maximized, restore
|
||||
@@ -3543,7 +3542,15 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
|
||||
}
|
||||
else
|
||||
{
|
||||
ClosePane(pane);
|
||||
// close the pane, but check that it
|
||||
// still exists in our pane array first
|
||||
// (the event handler above might have removed it)
|
||||
|
||||
wxAuiPaneInfo& check = GetPane(wnd);
|
||||
if (check.IsOk())
|
||||
{
|
||||
ClosePane(pane);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4352,7 +4359,16 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
|
||||
|
||||
if (!e.GetVeto())
|
||||
{
|
||||
ClosePane(pane);
|
||||
// close the pane, but check that it
|
||||
// still exists in our pane array first
|
||||
// (the event handler above might have removed it)
|
||||
|
||||
wxAuiPaneInfo& check = GetPane(pane.window);
|
||||
if (check.IsOk())
|
||||
{
|
||||
ClosePane(pane);
|
||||
}
|
||||
|
||||
Update();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user