From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 12 Feb 2001 13:45:18 +0000 (+0000)
Subject: Fix for unsafe use of a global pointer for focus window: now checks at destruct
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/44cd54c24e77f6cdf4003156a3d6809e2dd97483

Fix for unsafe use of a global pointer for focus window: now checks at destruct
time to see if we should NULL the pointer.


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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 18713c609d..af70202eaa 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2334,6 +2334,9 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
 
 wxWindow::~wxWindow()
 {
+    if (g_focusWindow == this)
+        g_focusWindow = NULL;
+
     m_isBeingDeleted = TRUE;
     m_hasVMT = FALSE;
 
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 18713c609d..af70202eaa 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2334,6 +2334,9 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
 
 wxWindow::~wxWindow()
 {
+    if (g_focusWindow == this)
+        g_focusWindow = NULL;
+
     m_isBeingDeleted = TRUE;
     m_hasVMT = FALSE;