Compilation fix for PCH-less in wxInfoBar.

[wxWidgets.git] / src / osx / cocoa / dialog.mm

diff --git a/src/osx/cocoa/dialog.mm b/src/osx/cocoa/dialog.mm
index 9d99165c63813cc8139bf700e99f01a59f193cbd..ab4ed1e5c32410fe9c1cc8a7a611eb851ef31e87 100644 (file)
--- a/src/osx/cocoa/dialog.mm
+++ b/src/osx/cocoa/dialog.mm
@@ -26,6 +26,22 @@ extern wxList wxModalDialogs;
 
 void wxDialog::DoShowModal()
 {
+    wxCHECK_RET( !IsModal(), wxT("DoShowModal() called twice") );
+
+    // If the app hasn't started, flush the event queue
+    // If we don't do this, the Dock doesn't get the message that
+    // the app has started so will refuse to activate it.
+    NSApplication *theNSApp = [NSApplication sharedApplication];
+    if (![theNSApp isRunning])
+    {
+        wxMacAutoreleasePool pool;
+        while(NSEvent *event = [theNSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES])
+        {
+            [theNSApp sendEvent:event];
+        }
+    }
+
+    wxModalDialogs.Append(this);
 
     SetFocus() ;
 /*
@@ -41,15 +57,34 @@ void wxDialog::DoShowModal()
         resetGroupParent = true;
     }
 */
-
     NSWindow* theWindow = GetWXWindow();
-    
+
     NSModalSession session = [NSApp beginModalSessionForWindow:theWindow];
-    while (IsModal()) 
+    while (IsModal())
     {
-        if ([NSApp runModalSession:session] != NSRunContinuesResponse)
+        wxMacAutoreleasePool autoreleasepool;
+        // we cannot break based on the return value, because nested
+        // alerts might set this to stopped as well, so it would be
+        // unsafe
+        [NSApp runModalSession:session];
+
+        // break if ended, perform no further idle processing
+        if (!IsModal())
             break;
-        // TODO should we do some idle processing ?
+
+        // do some idle processing
+        bool needMore = false;
+        if (wxTheApp)
+        {
+            wxTheApp->ProcessPendingEvents();
+            needMore = wxTheApp->ProcessIdle();
+        }
+        
+        if (!needMore)
+        {
+            // no more idle processing wanted - block until the next event
+            [theNSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantFuture] inMode:NSDefaultRunLoopMode dequeue:NO];
+        }
     }
     [NSApp endModalSession:session];