From dba39486b131ba301a3c05bf8ab76a337fd23bb2 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 17 Feb 2014 19:13:04 +0000 Subject: [PATCH] fixing nested modal sessions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/evtloop.mm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm index 5e4a869394..a067dd6415 100644 --- a/src/osx/cocoa/evtloop.mm +++ b/src/osx/cocoa/evtloop.mm @@ -418,6 +418,7 @@ void wxModalEventLoop::OSXDoRun() { BeginModalSession(m_modalWindow); wxCFEventLoop::OSXDoRun(); + EndModalSession(); } else #endif @@ -428,16 +429,7 @@ void wxModalEventLoop::OSXDoRun() void wxModalEventLoop::OSXDoStop() { -#if OSX_USE_MODAL_SESSION - if ( m_modalWindow ) - { - EndModalSession(); - } - else -#endif - { - [NSApp abortModal]; - } + [NSApp abortModal]; } // we need our own version of ProcessIdle here in order to