X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fcocoa%2Fcocoawindow.m;h=5b63e8c678e10daed993f181f82207dfd3a3186b;hb=9c5745de58e26321f939fd84c1c0f8a5a6cb2601;hp=9ed5133162d3c6ff791a62521b67624f38eb3550;hpb=ed2ada6539882e02e1054a3394bb62a182bf007b;p=libs%2Fgui.git diff --git a/source/graphics/cocoa/cocoawindow.m b/source/graphics/cocoa/cocoawindow.m index 9ed5133..5b63e8c 100644 --- a/source/graphics/cocoa/cocoawindow.m +++ b/source/graphics/cocoa/cocoawindow.m @@ -5,7 +5,7 @@ @interface WindowDelegate: NSObject -- (void)windowWillClose:(NSNotification *)notification; +- (BOOL)windowShouldClose:(id)sender; @end @@ -18,7 +18,6 @@ struct _CocoaWindow }; CFMutableDictionaryRef windows = NULL; -CFMutableArrayRef event_queue = NULL; CocoaWindow *create_window(CocoaDisplay *display, unsigned width, unsigned height, bool fullscreen, bool resizable) { @@ -96,16 +95,18 @@ void hide_window(CocoaWindow *window) @implementation WindowDelegate -- (void)windowWillClose:(NSNotification *)notification +- (BOOL)windowShouldClose:(id)sender { - CocoaWindow *window = lookup_window((NSWindow *)[notification object]); + CocoaWindow *window = lookup_window((NSWindow *)sender); if(window) { CocoaEvent event; event.any.type = WINDOW_CLOSED; event.any.window = window; queue_event(window->display, &event); + return NO; } + return YES; } @end