jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=91d9e7f83cd81b1b3098e3ee5016358799b1236e
commit 91d9e7f83cd81b1b3098e3ee5016358799b1236e Author: Jaehyun Cho <jae_hyun....@samsung.com> Date: Fri Dec 11 13:44:40 2015 +0900 Revert "ecore_cocoa: add support for system cursors" This reverts commit 4623d57762094011c5155cbea9512ae6a2db8852. This commit is duplicated with 2c93c73cbd1966e8cead7e7856044a2eb12138d7. --- src/lib/ecore_cocoa/Ecore_Cocoa.h | 4 -- src/lib/ecore_cocoa/ecore_cocoa_private.h | 2 + src/lib/ecore_cocoa/ecore_cocoa_window.m | 47 ---------------------- .../ecore_evas/engines/cocoa/ecore_evas_cocoa.c | 3 -- 4 files changed, 2 insertions(+), 54 deletions(-) diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa.h b/src/lib/ecore_cocoa/Ecore_Cocoa.h index 530f3a5..2a20050 100644 --- a/src/lib/ecore_cocoa/Ecore_Cocoa.h +++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h @@ -285,10 +285,6 @@ EAPI void ecore_cocoa_selection_clipboard_clear(void); EAPI void ecore_cocoa_window_cursor_set(Ecore_Cocoa_Window *win, Ecore_Cocoa_Cursor c); EAPI void ecore_cocoa_window_cursor_show(Ecore_Cocoa_Window *win, Eina_Bool show); - -EAPI void ecore_cocoa_window_cursor_set(Ecore_Cocoa_Window *win, Ecore_Cocoa_Cursor c); -EAPI void ecore_cocoa_window_cursor_show(Ecore_Cocoa_Window *win, Eina_Bool show); - #ifdef __cplusplus } #endif diff --git a/src/lib/ecore_cocoa/ecore_cocoa_private.h b/src/lib/ecore_cocoa/ecore_cocoa_private.h index db00288..535e08a 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_private.h +++ b/src/lib/ecore_cocoa/ecore_cocoa_private.h @@ -67,4 +67,6 @@ Eina_Bool _ecore_cocoa_window_init(void); Eina_Bool _ecore_cocoa_feed_events(void *anEvent); + + #endif diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m index 508eb8a..25a7c58 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_window.m +++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m @@ -578,50 +578,3 @@ _ecore_cocoa_window_init(void) return EINA_TRUE; } -EAPI void -ecore_cocoa_window_cursor_set(Ecore_Cocoa_Window *win, - Ecore_Cocoa_Cursor c) -{ - EINA_SAFETY_ON_NULL_RETURN(win); - EINA_SAFETY_ON_FALSE_RETURN((c >= 0) && (c <= __ECORE_COCOA_CURSOR_LAST)); - - NSCursor *cursor = _cursors[c]; - - DBG("Setting cursor %i (%s)", c, [[cursor description] UTF8String]); - [cursor set]; -} - -EAPI void -ecore_cocoa_window_cursor_show(Ecore_Cocoa_Window *win, - Eina_Bool show) -{ - EINA_SAFETY_ON_NULL_RETURN(win); - - if (show) [NSCursor unhide]; - else [NSCursor hide]; -} - -Eina_Bool -_ecore_cocoa_window_init(void) -{ - _cursors[ECORE_COCOA_CURSOR_ARROW] = [NSCursor arrowCursor]; - _cursors[ECORE_COCOA_CURSOR_CONTEXTUAL_MENU] = [NSCursor contextualMenuCursor]; - _cursors[ECORE_COCOA_CURSOR_CLOSED_HAND] = [NSCursor closedHandCursor]; - _cursors[ECORE_COCOA_CURSOR_CROSSHAIR] = [NSCursor crosshairCursor]; - _cursors[ECORE_COCOA_CURSOR_DISAPPEARING_ITEM] = [NSCursor disappearingItemCursor]; - _cursors[ECORE_COCOA_CURSOR_DRAG_COPY] = [NSCursor dragCopyCursor]; - _cursors[ECORE_COCOA_CURSOR_DRAG_LINK] = [NSCursor dragLinkCursor]; - _cursors[ECORE_COCOA_CURSOR_IBEAM] = [NSCursor IBeamCursor]; - _cursors[ECORE_COCOA_CURSOR_OPEN_HAND] = [NSCursor openHandCursor]; - _cursors[ECORE_COCOA_CURSOR_OPERATION_NOT_ALLOWED] = [NSCursor operationNotAllowedCursor]; - _cursors[ECORE_COCOA_CURSOR_POINTING_HAND] = [NSCursor pointingHandCursor]; - _cursors[ECORE_COCOA_CURSOR_RESIZE_DOWN] = [NSCursor resizeDownCursor]; - _cursors[ECORE_COCOA_CURSOR_RESIZE_LEFT] = [NSCursor resizeLeftCursor]; - _cursors[ECORE_COCOA_CURSOR_RESIZE_LEFT_RIGHT] = [NSCursor resizeLeftRightCursor]; - _cursors[ECORE_COCOA_CURSOR_RESIZE_RIGHT] = [NSCursor resizeRightCursor]; - _cursors[ECORE_COCOA_CURSOR_RESIZE_UP] = [NSCursor resizeUpCursor]; - _cursors[ECORE_COCOA_CURSOR_RESIZE_UP_DOWN] = [NSCursor resizeUpDownCursor]; - _cursors[ECORE_COCOA_CURSOR_IBEAM_VERTICAL] = [NSCursor IBeamCursorForVerticalLayout]; - - return EINA_TRUE; -} 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 551f416..0f9c3b6 100644 --- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c +++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c @@ -37,9 +37,6 @@ static Ecore_Event_Handler *ecore_evas_event_handlers[4]; static const char *_iface_name = "opengl_cocoa"; static const int _iface_version = 1; -static const char *_iface_name = "opengl_cocoa"; -static const int _iface_version = 1; - static int _render_updates_process(Ecore_Evas *ee, Eina_List *updates) { --