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

backport from trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2014-02-03 17:44:10 +00:00
parent 59f3c91d37
commit d1206a3f88
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osx/cocoa/evtloop.mm
View File

@@ -202,19 +202,18 @@ int wxGUIEventLoop::DoDispatchTimeout(unsigned long timeout)
{ {
if ( [[NSApplication sharedApplication] if ( [[NSApplication sharedApplication]
nextEventMatchingMask: NSAnyEventMask nextEventMatchingMask: NSAnyEventMask
untilDate: nil untilDate: [NSDate dateWithTimeIntervalSinceNow: timeout/1000.0]
inMode: NSDefaultRunLoopMode inMode: NSDefaultRunLoopMode
dequeue: NO] != nil ) dequeue: NO] != nil )
return 1; return 1;
return -1; return -1;
} }
case NSRunStoppedResponse: case NSRunStoppedResponse:
case NSRunAbortedResponse: case NSRunAbortedResponse:
return -1; return -1;
default: default:
wxFAIL_MSG("unknown response code"); // nested native loops may return other codes here, just ignore them
break; break;
} }
return -1; return -1;
@@ -223,7 +222,7 @@ int wxGUIEventLoop::DoDispatchTimeout(unsigned long timeout)
{ {
NSEvent *event = [NSApp NSEvent *event = [NSApp
nextEventMatchingMask:NSAnyEventMask nextEventMatchingMask:NSAnyEventMask
untilDate:[NSDate dateWithTimeIntervalSinceNow: timeout/1000] untilDate:[NSDate dateWithTimeIntervalSinceNow: timeout/1000.0]
inMode:NSDefaultRunLoopMode inMode:NSDefaultRunLoopMode
dequeue: YES]; dequeue: YES];