From: Robert Roebling <robert@roebling.de>
Date: Thu, 19 Feb 2004 23:13:01 +0000 (+0000)
Subject:   Don't update toolbar UI if the parent will
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fe5d86ed04a964e2bbcddae1be7e496b244981dd

  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 f2310dc1a9..d78bcf6fe8 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -621,6 +621,11 @@ void wxToolBarBase::UpdateWindowUI(long 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();