summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@openwide.fr>2015-10-13 18:25:01 +0200
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-10 08:32:49 +0100
commit70ad7994a8728446856b6e86c3e24576e9c9a64d (patch)
tree7fd7b0a0f9fbab41420b8e55f0e9e02caf9f7e5f
parent0435ba7c77ba74747de7a0a8e87b8eeb8a273616 (diff)
ecore_cocoa: remove ECORE_COCOA_EVENT_EXPOSE
-rw-r--r--src/lib/ecore_cocoa/Ecore_Cocoa.h1
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa.m2
-rw-r--r--src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c5
3 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa.h b/src/lib/ecore_cocoa/Ecore_Cocoa.h
index 40baa07541..27ae045a38 100644
--- a/src/lib/ecore_cocoa/Ecore_Cocoa.h
+++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h
@@ -72,7 +72,6 @@ EAPI extern int ECORE_COCOA_EVENT_LOST_FOCUS;
72/** Event triggered when a window is resized */ 72/** Event triggered when a window is resized */
73EAPI extern int ECORE_COCOA_EVENT_RESIZE; 73EAPI extern int ECORE_COCOA_EVENT_RESIZE;
74 74
75EAPI extern int ECORE_COCOA_EVENT_EXPOSE;
76EAPI extern int ECORE_COCOA_EVENT_WINDOW_DESTROY; 75EAPI extern int ECORE_COCOA_EVENT_WINDOW_DESTROY;
77 76
78/** 77/**
diff --git a/src/lib/ecore_cocoa/ecore_cocoa.m b/src/lib/ecore_cocoa/ecore_cocoa.m
index 9592664bea..a06222130b 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa.m
@@ -18,7 +18,6 @@
18EAPI int ECORE_COCOA_EVENT_GOT_FOCUS = 0; 18EAPI int ECORE_COCOA_EVENT_GOT_FOCUS = 0;
19EAPI int ECORE_COCOA_EVENT_LOST_FOCUS = 0; 19EAPI int ECORE_COCOA_EVENT_LOST_FOCUS = 0;
20EAPI int ECORE_COCOA_EVENT_RESIZE = 0; 20EAPI int ECORE_COCOA_EVENT_RESIZE = 0;
21EAPI int ECORE_COCOA_EVENT_EXPOSE = 0;
22EAPI int ECORE_COCOA_EVENT_WINDOW_DESTROY = 0; 21EAPI int ECORE_COCOA_EVENT_WINDOW_DESTROY = 0;
23 22
24static int _ecore_cocoa_init_count = 0; 23static int _ecore_cocoa_init_count = 0;
@@ -51,7 +50,6 @@ ecore_cocoa_init(void)
51 ECORE_COCOA_EVENT_GOT_FOCUS = ecore_event_type_new(); 50 ECORE_COCOA_EVENT_GOT_FOCUS = ecore_event_type_new();
52 ECORE_COCOA_EVENT_LOST_FOCUS = ecore_event_type_new(); 51 ECORE_COCOA_EVENT_LOST_FOCUS = ecore_event_type_new();
53 ECORE_COCOA_EVENT_RESIZE = ecore_event_type_new(); 52 ECORE_COCOA_EVENT_RESIZE = ecore_event_type_new();
54 ECORE_COCOA_EVENT_EXPOSE = ecore_event_type_new();
55 ECORE_COCOA_EVENT_WINDOW_DESTROY = ecore_event_type_new(); 53 ECORE_COCOA_EVENT_WINDOW_DESTROY = ecore_event_type_new();
56 54
57 55
diff --git a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
index 4e6cecfb15..66cecebce5 100644
--- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
@@ -32,7 +32,7 @@ static int _ecore_evas_init_count = 0;
32// FIXME: In case we have a lot of windows per app, we should probably use another container 32// FIXME: In case we have a lot of windows per app, we should probably use another container
33// like a rbtree or a dictionnary-based container 33// like a rbtree or a dictionnary-based container
34static Eina_List *ecore_evases = NULL; 34static Eina_List *ecore_evases = NULL;
35static Ecore_Event_Handler *ecore_evas_event_handlers[5] = { 0 }; 35static Ecore_Event_Handler *ecore_evas_event_handlers[4];
36 36
37static const char *_iface_name = "opengl_cocoa"; 37static const char *_iface_name = "opengl_cocoa";
38static const int _iface_version = 1; 38static const int _iface_version = 1;
@@ -301,8 +301,7 @@ _ecore_evas_cocoa_init(void)
301 ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_COCOA_EVENT_GOT_FOCUS, _ecore_evas_cocoa_event_got_focus, NULL); 301 ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_COCOA_EVENT_GOT_FOCUS, _ecore_evas_cocoa_event_got_focus, NULL);
302 ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_COCOA_EVENT_LOST_FOCUS, _ecore_evas_cocoa_event_lost_focus, NULL); 302 ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_COCOA_EVENT_LOST_FOCUS, _ecore_evas_cocoa_event_lost_focus, NULL);
303 ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_COCOA_EVENT_RESIZE, _ecore_evas_cocoa_event_video_resize, NULL); 303 ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_COCOA_EVENT_RESIZE, _ecore_evas_cocoa_event_video_resize, NULL);
304 ecore_evas_event_handlers[3] = ecore_event_handler_add(ECORE_COCOA_EVENT_EXPOSE, _ecore_evas_cocoa_event_video_expose, NULL); 304 ecore_evas_event_handlers[3] = ecore_event_handler_add(ECORE_COCOA_EVENT_WINDOW_DESTROY, _ecore_evas_cocoa_event_window_destroy, NULL);
305 ecore_evas_event_handlers[4] = ecore_event_handler_add(ECORE_COCOA_EVENT_WINDOW_DESTROY, _ecore_evas_cocoa_event_window_destroy, NULL);
306 305
307 return _ecore_evas_init_count; 306 return _ecore_evas_init_count;
308} 307}