X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/779a4d41ef6d606d39b03b4a7fa5fe27565bb66c..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/src/osx/cocoa/dialog.mm diff --git a/src/osx/cocoa/dialog.mm b/src/osx/cocoa/dialog.mm index d55449d1b5..6ae5bd86aa 100644 --- a/src/osx/cocoa/dialog.mm +++ b/src/osx/cocoa/dialog.mm @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/osx/cocoa/dialog.cpp +// Name: src/osx/cocoa/dialog.mm // Purpose: wxDialog class // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: dialog.cpp 54820 2008-07-29 20:04:11Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,71 +45,3 @@ void wxDialog::EndWindowModal() [NSApp endSheet: GetWXWindow()]; [GetWXWindow() orderOut:GetWXWindow()]; } - -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() ; -/* - WindowGroupRef windowGroup; - WindowGroupRef formerParentGroup; - bool resetGroupParent = false; - - if ( GetParent() == NULL ) - { - windowGroup = GetWindowGroup(windowRef) ; - formerParentGroup = GetWindowGroupParent( windowGroup ); - SetWindowGroupParent( windowGroup, GetWindowGroupOfClass( kMovableModalWindowClass ) ); - resetGroupParent = true; - } -*/ - NSWindow* theWindow = GetWXWindow(); - - NSModalSession session = [NSApp beginModalSessionForWindow:theWindow]; - while (IsModal()) - { - 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; - - // 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]; - -/* - if ( resetGroupParent ) - { - SetWindowGroupParent( windowGroup , formerParentGroup ); - } -*/ -}