Allow wxSplitterWindow::Initialize(NULL) in case we've deleted both child

windows and want to clean up dangling pointers

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 1d6a539568c2243723876f66882de18193ec99eb..58ec6da0e3a5d11cbb7a7a0ff8f59146cceb5c1f 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -662,7 +662,7 @@ void wxSplitterWindow::SizeWindows()
 // Set pane for unsplit window
 void wxSplitterWindow::Initialize(wxWindow *window)
 {
 // Set pane for unsplit window
 void wxSplitterWindow::Initialize(wxWindow *window)
 {

-    wxASSERT_MSG( window && window->GetParent() == this,
+    wxASSERT_MSG( (!window || (window && window->GetParent() == this)),

                   _T("windows in the splitter should have it as parent!") );
 
     m_windowOne = window;
                   _T("windows in the splitter should have it as parent!") );
 
     m_windowOne = window;