stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=51e4bcc32c8b3d20980dd4f669e92e32a95a82fb
commit 51e4bcc32c8b3d20980dd4f669e92e32a95a82fb Author: Bo Anderson <[email protected]> Date: Wed Mar 11 00:34:28 2020 +0000 ecore_cocoa: fix compile error using 10.15 SDK --- src/lib/ecore_cocoa/ecore_cocoa_app.h | 1 + src/lib/ecore_cocoa/ecore_cocoa_app.m | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_cocoa/ecore_cocoa_app.h b/src/lib/ecore_cocoa/ecore_cocoa_app.h index e6eac097fc..4eb9e7d752 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_app.h +++ b/src/lib/ecore_cocoa/ecore_cocoa_app.h @@ -9,6 +9,7 @@ Ecore_Timer *_timer; NSDate *_expiration; Ecore_Cocoa_Terminate_Cb _terminate_cb; + BOOL _is_running; } - (NSDate *)eventExpirationDate; diff --git a/src/lib/ecore_cocoa/ecore_cocoa_app.m b/src/lib/ecore_cocoa/ecore_cocoa_app.m index 8df1be1830..7d62e141e7 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_app.m +++ b/src/lib/ecore_cocoa/ecore_cocoa_app.m @@ -45,8 +45,7 @@ _ecore_cocoa_run_loop_cb(void *data EINA_UNUSED) - (void)internalUpdate { - [_mainMenu update]; - // FIXME Will not compile with GNUStep (member is named "_main_menu") + [[self mainMenu] update]; } - (id)init @@ -72,11 +71,16 @@ _ecore_cocoa_run_loop_cb(void *data EINA_UNUSED) return _expiration; } +- (BOOL)isRunning +{ + return _is_running; +} + - (void)run { [self finishLaunching]; - _running = 1; + _is_running = YES; _expiration = [NSDate distantPast]; _timer = ecore_timer_add(ECORE_COCOA_MAINLOOP_PERIOD, --
