correcting last commit

[wxWidgets.git] / src / cocoa / app.mm

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index f8f064934f73bb861a6af0ffce3bc8e72fdf0c55..59fcbc9f466a373d35211d4a9092b670e7991b20 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -70,12 +70,23 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
     plan on stopping the event loop, it is wise to send an event through
     the queue to ensure this method will return.
     See wxEventLoop::Exit() for more information.
     plan on stopping the event loop, it is wise to send an event through
     the queue to ensure this method will return.
     See wxEventLoop::Exit() for more information.

+
+    This overridden method calls the superclass method with an untilDate
+    parameter that indicates nil should be returned if there are no pending
+    events.  That is, nextEventMatchingMask: should not wait for an event.
+    If nil is returned then idle event processing occurs until the user
+    does not request anymore idle events or until a real event comes through.
+
+    RN: Even though Apple documentation states that nil can be passed in place 
+    of [NSDate distantPast] in the untilDate parameter, this causes Jaguar (10.2)
+    to get stuck in some kind of loop deep within nextEventMatchingMask:, thus we 
+    need to explicitly pass [NSDate distantPast] instead.

 */
    
 - (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag
 {
     // Get the same events except don't block
 */
    
 - (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag
 {
     // Get the same events except don't block

-    NSEvent *event = [super nextEventMatchingMask:mask untilDate:nil/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag];
+    NSEvent *event = [super nextEventMatchingMask:mask untilDate:[NSDate distantPast] inMode:mode dequeue:flag];

     // If we got one, simply return it
     if(event)
         return event;
     // If we got one, simply return it
     if(event)
         return event;


@@ -91,7 +102,7 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
         while(wxTheApp->ProcessIdle())
         {
             // Get the same events except don't block
         while(wxTheApp->ProcessIdle())
         {
             // Get the same events except don't block

-            NSEvent *event = [super nextEventMatchingMask:mask untilDate:nil/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag];
+            NSEvent *event = [super nextEventMatchingMask:mask untilDate:[NSDate distantPast] inMode:mode dequeue:flag];

             // If we got one, simply return it
             if(event)
                 return event;
             // If we got one, simply return it
             if(event)
                 return event;


@@ -150,7 +161,7 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
 
 - (void)controlTintChanged:(NSNotification *)notification
 {
 
 - (void)controlTintChanged:(NSNotification *)notification
 {

-    wxLogDebug("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate");
+    wxLogDebug(wxT("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate"));

 }
 
 @end // implementation wxNSApplicationDelegate : NSObject
 }
 
 @end // implementation wxNSApplicationDelegate : NSObject


@@ -322,7 +333,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
         wxAutoNSAutoreleasePool pool;
         NSEvent *event = [GetNSApplication()
                 nextEventMatchingMask:NSAnyEventMask
         wxAutoNSAutoreleasePool pool;
         NSEvent *event = [GetNSApplication()
                 nextEventMatchingMask:NSAnyEventMask

-                untilDate:nil /* ==[NSDate distantPast] */
+                untilDate:[NSDate distantPast]

                 inMode:NSDefaultRunLoopMode
                 dequeue: YES];
         if(!event)
                 inMode:NSDefaultRunLoopMode
                 dequeue: YES];
         if(!event)