X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe5d86ed04a964e2bbcddae1be7e496b244981dd..4b1e72e266ec6993d665c65d5f5e59e7981afc17:/src/common/tbarbase.cpp diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index d78bcf6fe8..f04db4ad71 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -41,7 +41,7 @@ #include "wx/toolbar.h" // ---------------------------------------------------------------------------- -// wxWindows macros +// wxWidgets macros // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxToolBarBase, wxControl) @@ -623,7 +623,8 @@ void wxToolBarBase::UpdateWindowUI(long flags) // There is no sense in updating the toolbar UI // if the parent window is about to get destroyed - if (GetParent() && wxPendingDelete.Member( GetParent() )) + wxWindow *tlw = wxGetTopLevelParent( this ); + if (tlw && wxPendingDelete.Member( tlw )) return; wxEvtHandler* evtHandler = GetEventHandler() ;