Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-29 17:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use ReceiveNextEvent instead of AcquireFirstMatchingEventInQueue in order to continue supporting Mac OS X 10.2. Concept reviewed by Josh ;-)

Browse Source
This commit is contained in:
darin%meer.net 2006-05-10 19:17:40 +00:00
parent dbe525c0d8
commit 0468cf2ee0
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
widget/src/mac/nsAppShell.cpp
View File

@ -175,10 +175,15 @@ nsAppShell::ScheduleNativeEventCallback()
PRBool
nsAppShell::ProcessNextNativeEvent(PRBool aMayWait)
{
EventQueueRef carbonEventQueue = ::GetCurrentEventQueue();
PRBool eventProcessed = PR_FALSE;
if (!aMayWait) {
// Only process a single event.
#if 0
EventQueueRef carbonEventQueue = ::GetCurrentEventQueue();
// This requires Mac OS X 10.3 or later... we cannot use it until the
// builds systems are upgraded --darin
if (EventRef carbonEvent =
::AcquireFirstMatchingEventInQueue(carbonEventQueue,
0,
@ -188,13 +193,27 @@ nsAppShell::ProcessNextNativeEvent(PRBool aMayWait)
::RemoveEventFromQueue(carbonEventQueue, carbonEvent);
::ReleaseEvent(carbonEvent);
}
#endif
EventRef carbonEvent;
OSStatus err = ::ReceiveNextEvent(0, nsnull, kEventDurationNoWait, PR_TRUE,
&carbonEvent);
if (err == noErr && carbonEvent) {
::SendEventToEventTarget(carbonEvent, ::GetEventDispatcherTarget());
::ReleaseEvent(carbonEvent);
eventProcessed = PR_TRUE;
}
}
else {
// XXX(darin): It seems to me that we should be using ReceiveNextEvent here
// as well to ensure that we only wait for and process a single event.
// Run the loop until interrupted by ::QuitApplicationEventLoop().
::RunApplicationEventLoop();
eventProcessed = PR_TRUE;
}
return ::GetNumEventsInQueue(carbonEventQueue);
return eventProcessed;
}
// ProcessGeckoEvents