From 44cd54c24e77f6cdf4003156a3d6809e2dd97483 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 12 Feb 2001 13:45:18 +0000 Subject: [PATCH] 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 --- src/gtk/window.cpp | 3 +++ src/gtk1/window.cpp | 3 +++ 2 files changed, 6 insertions(+) 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; -- 2.47.2