use (new) safer GetTraitsIfExists() in wxMutexGuiEnter/Leave() to avoid crashing...

[wxWidgets.git] / src / msw / nativewin.cpp

diff --git a/src/msw/nativewin.cpp b/src/msw/nativewin.cpp
index 3ac00548a74a94e45482e72465296151379cf8cb..6b3649b842a3309eb64a5ffe23b04168b55278f4 100644 (file)
--- a/src/msw/nativewin.cpp
+++ b/src/msw/nativewin.cpp
@@ -56,7 +56,23 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle hwnd)
 
 void wxNativeContainerWindow::OnNativeDestroyed()
 {
-    // currently this is not called so nothing to do here
+    // don't use Close() or even Destroy() here, we really don't want to keep
+    // an object using a no more existing HWND around for longer than necessary
+    delete this;
+}
+
+WXLRESULT wxNativeContainerWindow::MSWWindowProc(WXUINT nMsg,
+                                                 WXWPARAM wParam,
+                                                 WXLPARAM lParam)
+{
+    if ( nMsg == WM_DESTROY )
+    {
+        OnNativeDestroyed();
+
+        return 0;
+    }
+
+    return wxTopLevelWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
 wxNativeContainerWindow::~wxNativeContainerWindow()