From: Stefan Csomor Date: Tue, 4 Feb 2003 22:30:58 +0000 (+0000) Subject: added hints from QA 1061 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d8e9da78a0d0a0fa54a0f2260434f20cdfe74f1b added hints from QA 1061 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/mac/app.cpp b/src/mac/app.cpp index 3fd3606748..d0fbd93e49 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -302,6 +302,7 @@ void wxApp::MacNewFile() { kEventClassAppleEvent , kEventAppleEvent } , { kEventClassMouse , kEventMouseDown } , + { 'WXMC' , 'WXMC' } } ; static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) @@ -1170,14 +1171,7 @@ bool wxApp::ProcessIdle() void wxApp::ExitMainLoop() { -#if TARGET_CARBON - if (s_inReceiveEvent) - QuitApplicationEventLoop() ; - else - m_keepGoing = FALSE; -#else m_keepGoing = FALSE; -#endif } // Is a message/event pending? @@ -1360,7 +1354,8 @@ bool wxApp::Yield(bool onlyIfNeeded) } else if ( status == eventLoopQuitErr ) { - m_keepGoing = false ; + // according to QA1061 this may also occur when a WakeUp Process + // is executed } else { @@ -1374,7 +1369,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // having a larger value here leads to large performance slowdowns // so we cannot give background apps more processor time here // we do so however having a large sleep value in the main event loop - long sleepTime = 0 ; + sleepTime = 0 ; while ( !IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn)) { @@ -1468,7 +1463,8 @@ void wxApp::MacDoOneEvent() } else if ( status == eventLoopQuitErr ) { - m_keepGoing = false ; + // according to QA1061 this may also occur when a WakeUp Process + // is executed } else { diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 3fd3606748..d0fbd93e49 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -302,6 +302,7 @@ void wxApp::MacNewFile() { kEventClassAppleEvent , kEventAppleEvent } , { kEventClassMouse , kEventMouseDown } , + { 'WXMC' , 'WXMC' } } ; static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) @@ -1170,14 +1171,7 @@ bool wxApp::ProcessIdle() void wxApp::ExitMainLoop() { -#if TARGET_CARBON - if (s_inReceiveEvent) - QuitApplicationEventLoop() ; - else - m_keepGoing = FALSE; -#else m_keepGoing = FALSE; -#endif } // Is a message/event pending? @@ -1360,7 +1354,8 @@ bool wxApp::Yield(bool onlyIfNeeded) } else if ( status == eventLoopQuitErr ) { - m_keepGoing = false ; + // according to QA1061 this may also occur when a WakeUp Process + // is executed } else { @@ -1374,7 +1369,7 @@ bool wxApp::Yield(bool onlyIfNeeded) // having a larger value here leads to large performance slowdowns // so we cannot give background apps more processor time here // we do so however having a large sleep value in the main event loop - long sleepTime = 0 ; + sleepTime = 0 ; while ( !IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn)) { @@ -1468,7 +1463,8 @@ void wxApp::MacDoOneEvent() } else if ( status == eventLoopQuitErr ) { - m_keepGoing = false ; + // according to QA1061 this may also occur when a WakeUp Process + // is executed } else {