From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Apr 2011 23:36:46 +0000 (+0000)
Subject: Don't send wxWindowDestroyEvent if we hadn't sent wxWindowCreateEvent.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/935594c16ea92527a31cfff50e8daa0d7eed5a1e

Don't send wxWindowDestroyEvent if we hadn't sent wxWindowCreateEvent.

Don't generate wxWindowDestroyEvent when destroying the windows that had been
never created for symmetry with wxWindowCreateEvent which wasn't sent for this
window neither.

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 3e3836e683..0b8a353c3a 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -554,7 +554,14 @@ void wxWindowBase::SendDestroyEvent()
 
 bool wxWindowBase::Destroy()
 {
-    SendDestroyEvent();
+    // If our handle is invalid, it means that this window has never been
+    // created, either because creating it failed or, more typically, because
+    // this wxWindow object was default-constructed and its Create() method had
+    // never been called. As we didn't send wxWindowCreateEvent in this case
+    // (which is sent after successful creation), don't send the matching
+    // wxWindowDestroyEvent neither.
+    if ( GetHandle() )
+        SendDestroyEvent();
 
     delete this;