From: Stefan Csomor Date: Sun, 12 May 2013 20:18:57 +0000 (+0000) Subject: deactivating r65382 see #12267 (which does not seem to happen anymore even without... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/49ee8d1f65f6f4802c36d8572a9513804dec1aa7 deactivating r65382 see #12267 (which does not seem to happen anymore even without this change), fixes #14938, git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index e6d722ba2e..9bda9421f0 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -1352,6 +1352,9 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd) NSView* otherView = FindFocus(); wxWidgetImpl* otherWindow = FindFromWXWidget(otherView); + // CS: the fix for #12267 leads to missed focus events like in #14938 , as #12267 doesn't seem to happen anymore even + // without the fix, I'm turning it off, if it still is needed we should only use it in case of the wxGridCellTextEditor +#if 0 // It doesn't make sense to notify about the loss of focus if we're not // really losing it and the window which has just gained focus is the same // one as this window itself. Of course, this should never happen in the @@ -1359,7 +1362,8 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd) // enter into an infinite recursion, see #12267. if ( otherWindow == this ) return r; - +#endif + // NSTextViews have an editor as true responder, therefore the might get the // resign notification if their editor takes over, don't trigger any event then if ( r && !m_hasEditor)