diff options
author | Bo Anderson <mail@boanderson.me> | 2020-03-11 00:34:28 +0000 |
---|---|---|
committer | Stefan Schmidt <s.schmidt@samsung.com> | 2020-04-16 10:10:03 +0200 |
commit | 51e4bcc32c8b3d20980dd4f669e92e32a95a82fb (patch) | |
tree | 06aad46ab268cb7ef5655c1dbfa1266459a9b607 | |
parent | e88311ae955b2d54356c455fc05e7c2ff7abaa66 (diff) |
ecore_cocoa: fix compile error using 10.15 SDK
-rw-r--r-- | src/lib/ecore_cocoa/ecore_cocoa_app.h | 1 | ||||
-rw-r--r-- | 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 @@ | |||
9 | Ecore_Timer *_timer; | 9 | Ecore_Timer *_timer; |
10 | NSDate *_expiration; | 10 | NSDate *_expiration; |
11 | Ecore_Cocoa_Terminate_Cb _terminate_cb; | 11 | Ecore_Cocoa_Terminate_Cb _terminate_cb; |
12 | BOOL _is_running; | ||
12 | } | 13 | } |
13 | 14 | ||
14 | - (NSDate *)eventExpirationDate; | 15 | - (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) | |||
45 | 45 | ||
46 | - (void)internalUpdate | 46 | - (void)internalUpdate |
47 | { | 47 | { |
48 | [_mainMenu update]; | 48 | [[self mainMenu] update]; |
49 | // FIXME Will not compile with GNUStep (member is named "_main_menu") | ||
50 | } | 49 | } |
51 | 50 | ||
52 | - (id)init | 51 | - (id)init |
@@ -72,11 +71,16 @@ _ecore_cocoa_run_loop_cb(void *data EINA_UNUSED) | |||
72 | return _expiration; | 71 | return _expiration; |
73 | } | 72 | } |
74 | 73 | ||
74 | - (BOOL)isRunning | ||
75 | { | ||
76 | return _is_running; | ||
77 | } | ||
78 | |||
75 | - (void)run | 79 | - (void)run |
76 | { | 80 | { |
77 | [self finishLaunching]; | 81 | [self finishLaunching]; |
78 | 82 | ||
79 | _running = 1; | 83 | _is_running = YES; |
80 | _expiration = [NSDate distantPast]; | 84 | _expiration = [NSDate distantPast]; |
81 | 85 | ||
82 | _timer = ecore_timer_add(ECORE_COCOA_MAINLOOP_PERIOD, | 86 | _timer = ecore_timer_add(ECORE_COCOA_MAINLOOP_PERIOD, |