summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Fl_cocoa.mm7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 32193655e..5511ae167 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1460,6 +1460,7 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
@public
TSMDocumentID currentDoc;
}
+- (void)applicationDidFinishLaunching:(NSNotification *)notification;
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender;
- (void)applicationDidBecomeActive:(NSNotification *)notify;
- (void)applicationDidChangeScreenParameters:(NSNotification *)aNotification;
@@ -1471,6 +1472,10 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
- (void)open_cb:(void (*)(const char*))cb;
@end
@implementation FLAppDelegate
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+ if (fl_mac_os_version >= 101300) [NSApp stop:nil];
+}
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender
{
fl_lock_function();
@@ -1716,7 +1721,7 @@ void Fl_Cocoa_Screen_Driver::open_display_platform() {
localPool = [[NSAutoreleasePool alloc] init]; // never released
FLAppDelegate *delegate = (fl_mac_os_version < 100500 ? [FLAppDelegateBefore10_5 alloc] : [FLAppDelegate alloc]);
[(NSApplication*)NSApp setDelegate:[delegate init]];
- if (need_new_nsapp) [NSApp finishLaunching];
+ if (need_new_nsapp) (fl_mac_os_version >= 101300 ? [NSApp run] : [NSApp finishLaunching]);
// empty the event queue but keep system events for drag&drop of files at launch
NSEvent *ign_event;