Override CanFocus because the wxWindow level test will check if the NSTextView's...

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

diff --git a/src/osx/cocoa/dialog.mm b/src/osx/cocoa/dialog.mm
index 4af807536ad6a687ffe1903435d30b885ede199b..d55449d1b517559bb9079616f5644483788c3826 100644 (file)
--- a/src/osx/cocoa/dialog.mm
+++ b/src/osx/cocoa/dialog.mm
@@ -24,11 +24,42 @@
 
 extern wxList wxModalDialogs;
 
 
 extern wxList wxModalDialogs;
 

-void wxDialog::DoShowModal()
+void wxDialog::DoShowWindowModal()
+{   
+    wxTopLevelWindow* parent = static_cast<wxTopLevelWindow*>(wxGetTopLevelParent(GetParent()));
+    
+    wxASSERT_MSG(parent, "ShowWindowModal requires the dialog to have a parent.");
+    
+    NSWindow* parentWindow = parent->GetWXWindow();
+    NSWindow* theWindow = GetWXWindow();
+    
+    [NSApp beginSheet: theWindow
+            modalForWindow: parentWindow
+            modalDelegate: theWindow
+            didEndSelector: nil
+            contextInfo: nil];
+}
+
+void wxDialog::EndWindowModal()

 {
 {

-    wxCHECK_RET( !IsModal(), wxT("DoShowModal() called twice") );
+    [NSApp endSheet: GetWXWindow()];
+    [GetWXWindow() orderOut:GetWXWindow()];
+}

 
 

-    wxModalDialogs.Append(this);
+void wxDialog::DoShowModal()
+{
+    // 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];
+        }
+    }

 
     SetFocus() ;
 /*
 
     SetFocus() ;
 /*


@@ -55,9 +86,23 @@ void wxDialog::DoShowModal()
         // unsafe
         [NSApp runModalSession:session];
 
         // unsafe
         [NSApp runModalSession:session];
 

+        // break if ended, perform no further idle processing
+        if (!IsModal())
+            break;
+

         // do some idle processing
         // do some idle processing

+        bool needMore = false;

         if (wxTheApp)
         if (wxTheApp)

-            wxTheApp->ProcessIdle();
+        {
+            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];
 
     }
     [NSApp endModalSession:session];