Don't update toolbar UI if the parent will

   get destroyed later anyway.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index f2310dc1a912e1e92dfdf62172f7ae7efd2beeac..d78bcf6fe8886713369a32749aa535d49b2a9da3 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -621,6 +621,11 @@ void wxToolBarBase::UpdateWindowUI(long flags)
 {
     wxWindowBase::UpdateWindowUI(flags);
 
 {
     wxWindowBase::UpdateWindowUI(flags);
 

+    // There is no sense in updating the toolbar UI
+    // if the parent window is about to get destroyed
+    if (GetParent() && wxPendingDelete.Member( GetParent() ))
+        return;
+

     wxEvtHandler* evtHandler = GetEventHandler() ;
 
     for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
     wxEvtHandler* evtHandler = GetEventHandler() ;
 
     for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();