reset g_delayedFocus when the window is deleted to avoid crashes when using it

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 948e88e8b39bc01960ed60de0b3006bc5be93d6f..108c6b69295c2cb10ab684f08c8df10af46cccc3 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2524,6 +2524,9 @@ wxWindowGTK::~wxWindowGTK()
     if (g_activeFrame == this)
         g_activeFrame = NULL;
 
     if (g_activeFrame == this)
         g_activeFrame = NULL;
 

+    if ( g_delayedFocus == this )
+        g_delayedFocus = NULL;
+

     m_isBeingDeleted = TRUE;
     m_hasVMT = FALSE;
 
     m_isBeingDeleted = TRUE;
     m_hasVMT = FALSE;
 

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 948e88e8b39bc01960ed60de0b3006bc5be93d6f..108c6b69295c2cb10ab684f08c8df10af46cccc3 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2524,6 +2524,9 @@ wxWindowGTK::~wxWindowGTK()
     if (g_activeFrame == this)
         g_activeFrame = NULL;
 
     if (g_activeFrame == this)
         g_activeFrame = NULL;
 

+    if ( g_delayedFocus == this )
+        g_delayedFocus = NULL;
+

     m_isBeingDeleted = TRUE;
     m_hasVMT = FALSE;
 
     m_isBeingDeleted = TRUE;
     m_hasVMT = FALSE;