don't crash when destroying window with scrollbars

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

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 215d74028e69df8abce1db4f5b752813640b4179..7485272ce95f654acedafaca46db0d84e760bfb5 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -196,6 +196,14 @@ wxWindow::~wxWindow()
 {
     m_isBeingDeleted = true;
 
 {
     m_isBeingDeleted = true;
 

+#if wxUSE_SCROLLBAR
+    // clear pointers to scrollbar before deleting the children: they are
+    // children and so will be deleted by DestroyChildren() call below and if
+    // any code using the scrollbars would be called in the process or from
+    // ~wxWindowBase, the app would crash:
+    m_scrollbarVert = m_scrollbarHorz = NULL;
+#endif
+

     // we have to destroy our children before we're destroyed because our
     // children suppose that we're of type wxWindow, not just wxWindowNative,
     // and so bad things may happen if they're deleted from the base class dtor
     // we have to destroy our children before we're destroyed because our
     // children suppose that we're of type wxWindow, not just wxWindowNative,
     // and so bad things may happen if they're deleted from the base class dtor