Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added hints from QA 1061

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-02-04 22:30:58 +00:00
parent a19f009bce
commit d8e9da78a0
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mac/app.cpp
View File

@@ -302,6 +302,7 @@ void wxApp::MacNewFile()
{ kEventClassAppleEvent , kEventAppleEvent } , { kEventClassAppleEvent , kEventAppleEvent } ,
{ kEventClassMouse , kEventMouseDown } , { kEventClassMouse , kEventMouseDown } ,
{ 'WXMC' , 'WXMC' }
} ; } ;
static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
@@ -1170,14 +1171,7 @@ bool wxApp::ProcessIdle()
void wxApp::ExitMainLoop() void wxApp::ExitMainLoop()
{ {
#if TARGET_CARBON
if (s_inReceiveEvent)
QuitApplicationEventLoop() ;
else
m_keepGoing = FALSE;
#else
m_keepGoing = FALSE; m_keepGoing = FALSE;
#endif
} }
// Is a message/event pending? // Is a message/event pending?
@@ -1360,7 +1354,8 @@ bool wxApp::Yield(bool onlyIfNeeded)
} }
else if ( status == eventLoopQuitErr ) else if ( status == eventLoopQuitErr )
{ {
m_keepGoing = false ; // according to QA1061 this may also occur when a WakeUp Process
// is executed
} }
else else
{ {
@@ -1374,7 +1369,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
// having a larger value here leads to large performance slowdowns // having a larger value here leads to large performance slowdowns
// so we cannot give background apps more processor time here // so we cannot give background apps more processor time here
// we do so however having a large sleep value in the main event loop // 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)) while ( !IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn))
{ {
@@ -1468,7 +1463,8 @@ void wxApp::MacDoOneEvent()
} }
else if ( status == eventLoopQuitErr ) else if ( status == eventLoopQuitErr )
{ {
m_keepGoing = false ; // according to QA1061 this may also occur when a WakeUp Process
// is executed
} }
else else
{ {

16
src/mac/carbon/app.cpp
View File

@@ -302,6 +302,7 @@ void wxApp::MacNewFile()
{ kEventClassAppleEvent , kEventAppleEvent } , { kEventClassAppleEvent , kEventAppleEvent } ,
{ kEventClassMouse , kEventMouseDown } , { kEventClassMouse , kEventMouseDown } ,
{ 'WXMC' , 'WXMC' }
} ; } ;
static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
@@ -1170,14 +1171,7 @@ bool wxApp::ProcessIdle()
void wxApp::ExitMainLoop() void wxApp::ExitMainLoop()
{ {
#if TARGET_CARBON
if (s_inReceiveEvent)
QuitApplicationEventLoop() ;
else
m_keepGoing = FALSE;
#else
m_keepGoing = FALSE; m_keepGoing = FALSE;
#endif
} }
// Is a message/event pending? // Is a message/event pending?
@@ -1360,7 +1354,8 @@ bool wxApp::Yield(bool onlyIfNeeded)
} }
else if ( status == eventLoopQuitErr ) else if ( status == eventLoopQuitErr )
{ {
m_keepGoing = false ; // according to QA1061 this may also occur when a WakeUp Process
// is executed
} }
else else
{ {
@@ -1374,7 +1369,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
// having a larger value here leads to large performance slowdowns // having a larger value here leads to large performance slowdowns
// so we cannot give background apps more processor time here // so we cannot give background apps more processor time here
// we do so however having a large sleep value in the main event loop // 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)) while ( !IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, (RgnHandle) wxApp::s_macCursorRgn))
{ {
@@ -1468,7 +1463,8 @@ void wxApp::MacDoOneEvent()
} }
else if ( status == eventLoopQuitErr ) else if ( status == eventLoopQuitErr )
{ {
m_keepGoing = false ; // according to QA1061 this may also occur when a WakeUp Process
// is executed
} }
else else
{ {