From 3ba1c7e1669a2dbbca998073782bc35655a31768 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 18 May 2014 13:59:09 +0000
Subject: [PATCH] allowing reentrancy on NSPanels makeResponder as in NSWindow,
 see #14269

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/osx/cocoa/nonownedwnd.mm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index c3124d27f0..f0679dc8aa 100644
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -296,9 +296,13 @@ static NSResponder* s_formerFirstResponder = NULL;
 
 - (BOOL)makeFirstResponder:(NSResponder *)aResponder
 {
+    NSResponder* tempFormer = s_formerFirstResponder;
+    NSResponder* tempNext = s_nextFirstResponder;
     s_nextFirstResponder = aResponder;
+    s_formerFirstResponder = [[NSApp keyWindow] firstResponder];
     BOOL retval = [super makeFirstResponder:aResponder];
-    s_nextFirstResponder = nil;
+    s_nextFirstResponder = tempNext;
+    s_formerFirstResponder = tempFormer;
     return retval;
 }