jayji pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=88e352efe826624c35033a0880c7654b548bbe4a
commit 88e352efe826624c35033a0880c7654b548bbe4a Author: Jean Guyomarc'h <[email protected]> Date: Wed Mar 8 22:06:35 2017 +0100 ecore_cocoa: pass the right window to ecore_evas --- src/lib/ecore_cocoa/ecore_cocoa_window.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m index 249c0a8..716fc64 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_window.m +++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m @@ -68,13 +68,13 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST]; event->w = size.width; event->h = size.height - (([self isFullScreen] == YES) ? 0 : ecore_cocoa_titlebar_height_get()); - event->cocoa_window = self; + event->cocoa_window = self.ecore_window_data; ecore_event_add(ECORE_COCOA_EVENT_WINDOW_RESIZE_REQUEST, event, NULL, NULL); return YES; } -- (void)windowWillClose:(NSNotification *) notification +- (void)windowWillClose:(NSNotification *) EINA_UNUSED notif { Ecore_Cocoa_Event_Window_Destroy *event; @@ -84,7 +84,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST]; CRI("Failed to allocate Ecore_Cocoa_Event_Window"); return; } - event->cocoa_window = [notification object]; + event->cocoa_window = self.ecore_window_data; ecore_event_add(ECORE_COCOA_EVENT_WINDOW_DESTROY, event, NULL, NULL); } @@ -122,7 +122,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST]; } } -- (void)windowDidBecomeKey:(NSNotification *)notification +- (void)windowDidBecomeKey:(NSNotification *) EINA_UNUSED notif { Ecore_Cocoa_Event_Window_Focused *e; @@ -132,7 +132,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST]; CRI("Failed to allocate Ecore_Cocoa_Event_Window"); return; } - e->cocoa_window = [notification object]; + e->cocoa_window = self.ecore_window_data; ecore_event_add(ECORE_COCOA_EVENT_WINDOW_FOCUSED, e, NULL, NULL); } @@ -150,7 +150,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST]; [NSApp resumeNSRunLoopMonitoring]; } -- (void)windowDidResignKey:(NSNotification *)notification +- (void)windowDidResignKey:(NSNotification *) EINA_UNUSED notif { Ecore_Cocoa_Event_Window_Unfocused *e; @@ -160,7 +160,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST]; CRI("Failed to allocate Ecore_Cocoa_Event_Window"); return; } - e->cocoa_window = [notification object]; + e->cocoa_window = self.ecore_window_data; ecore_event_add(ECORE_COCOA_EVENT_WINDOW_UNFOCUSED, e, NULL, NULL); } --
