Avoid selecting/updating in destructor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-21 16:56:39 +00:00
parent 5bcdf503fa
commit 18b40f3022

View File

@@ -2865,6 +2865,9 @@ void wxAuiNotebook::InitNotebook(long style)
wxAuiNotebook::~wxAuiNotebook() wxAuiNotebook::~wxAuiNotebook()
{ {
// Indicate we're deleting pages
m_isBeingDeleted = true;
while ( GetPageCount() > 0 ) while ( GetPageCount() > 0 )
DeletePage(0); DeletePage(0);
@@ -3225,7 +3228,7 @@ bool wxAuiNotebook::RemovePage(size_t page_idx)
RemoveEmptyTabFrames(); RemoveEmptyTabFrames();
// set new active pane // set new active pane
if (new_active) if (new_active && !m_isBeingDeleted)
{ {
m_curpage = -1; m_curpage = -1;
SetSelectionToWindow(new_active); SetSelectionToWindow(new_active);
@@ -4104,6 +4107,7 @@ void wxAuiNotebook::RemoveEmptyTabFrames()
m_mgr.GetPane(first_good).Centre(); m_mgr.GetPane(first_good).Centre();
} }
if (!m_isBeingDeleted)
m_mgr.Update(); m_mgr.Update();
} }