cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b21ab5b5419d619fcae411054b7922a73210dd1b
commit b21ab5b5419d619fcae411054b7922a73210dd1b
Author: Jean Guyomarc'h <jean.guyoma...@gmail.com>
Date: Wed Jan 6 23:04:33 2016 +0100
ecore_cocoa: move Ecore_Cocoa_Cursor.h in Ecore_Cocoa.h
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
src/Makefile_Ecore_Cocoa.am | 3 +--
src/lib/ecore_cocoa/Ecore_Cocoa.h | 34 +++++++++++++++++++++++++++++++-
src/lib/ecore_cocoa/Ecore_Cocoa_Cursor.h | 32 ------------------------------
src/lib/ecore_cocoa/ecore_cocoa_window.m | 1 -
4 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
index 66dc4f7..1283125 100644
--- a/src/Makefile_Ecore_Cocoa.am
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -6,8 +6,7 @@ lib_LTLIBRARIES += lib/ecore_cocoa/libecore_cocoa.la
installed_ecorecocoamainheadersdir = $(includedir)/ecore-cocoa-@VMAJ@
dist_installed_ecorecocoamainheaders_DATA = \
-lib/ecore_cocoa/Ecore_Cocoa.h \
-lib/ecore_cocoa/Ecore_Cocoa_Cursor.h
+lib/ecore_cocoa/Ecore_Cocoa.h
lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \
lib/ecore_cocoa/ecore_cocoa.m \
diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa.h
b/src/lib/ecore_cocoa/Ecore_Cocoa.h
index b9a534a..42bc61d 100644
--- a/src/lib/ecore_cocoa/Ecore_Cocoa.h
+++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h
@@ -34,7 +34,6 @@
# define EAPI
#endif
-#include "Ecore_Cocoa_Cursor.h"
#ifdef __cplusplus
extern "C" {
@@ -84,6 +83,39 @@ typedef struct _Ecore_Cocoa_Event_Window_Unfocused
Ecore_Cocoa_Event_Window_Unfo
*/
typedef struct _Ecore_Cocoa_Event_Window_Destroy
Ecore_Cocoa_Event_Window_Destroy;
+/**
+ * @typedef Ecore_Cocoa_Cursor
+ * Values of the Cocoa cursors handled by Ecore_Cocoa
+ * See
https://developer.apple.com/library/mac/documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/index.html
for images of each cursors.
+ */
+typedef enum
+{
+ ECORE_COCOA_CURSOR_ARROW = 0, /**< Arrow cursor */
+ ECORE_COCOA_CURSOR_CONTEXTUAL_MENU, /**< Contextual menu cursor */
+ ECORE_COCOA_CURSOR_CLOSED_HAND, /**< Closed hand cursor */
+ ECORE_COCOA_CURSOR_CROSSHAIR, /**< Crosshair cursor */
+ ECORE_COCOA_CURSOR_DISAPPEARING_ITEM, /**< Disappearing item cursor */
+ ECORE_COCOA_CURSOR_DRAG_COPY, /** Drag copy cursor */
+ ECORE_COCOA_CURSOR_DRAG_LINK, /**< Drag link cursor */
+ ECORE_COCOA_CURSOR_IBEAM, /**< IBeam cursor */
+ ECORE_COCOA_CURSOR_OPEN_HAND, /**< Open hand cursor */
+ ECORE_COCOA_CURSOR_OPERATION_NOT_ALLOWED, /**< Operation not allowed cursor
*/
+ ECORE_COCOA_CURSOR_POINTING_HAND, /**< Pointing hand cursor */
+ ECORE_COCOA_CURSOR_RESIZE_DOWN, /**< Resize down cursor */
+ ECORE_COCOA_CURSOR_RESIZE_LEFT, /**< Resize left cursor */
+ ECORE_COCOA_CURSOR_RESIZE_LEFT_RIGHT, /**< Resize left right cursor */
+ ECORE_COCOA_CURSOR_RESIZE_RIGHT, /**< Resize right cursor */
+ ECORE_COCOA_CURSOR_RESIZE_UP, /**< Resize up cursor */
+ ECORE_COCOA_CURSOR_RESIZE_UP_DOWN, /**< Resize up down cursor */
+ ECORE_COCOA_CURSOR_IBEAM_VERTICAL, /**< IBeam vertical cursor */
+
+ __ECORE_COCOA_CURSOR_LAST, /**< Sentinel. DO NOT USE */
+
+ ECORE_COCOA_CURSOR_DEFAULT = ECORE_COCOA_CURSOR_ARROW /**< Default Cocoa
cursor */
+
+} Ecore_Cocoa_Cursor;
+
+
/** Event triggered when a Cocoa window receives focus */
EAPI extern int ECORE_COCOA_EVENT_WINDOW_FOCUSED;
diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa_Cursor.h
b/src/lib/ecore_cocoa/Ecore_Cocoa_Cursor.h
deleted file mode 100644
index 6bca47f..0000000
--- a/src/lib/ecore_cocoa/Ecore_Cocoa_Cursor.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __ECORE_COCOA_CURSOR_H__
-#define __ECORE_COCOA_CURSOR_H__
-
-typedef enum
-{
- ECORE_COCOA_CURSOR_ARROW = 0,
- ECORE_COCOA_CURSOR_CONTEXTUAL_MENU,
- ECORE_COCOA_CURSOR_CLOSED_HAND,
- ECORE_COCOA_CURSOR_CROSSHAIR,
- ECORE_COCOA_CURSOR_DISAPPEARING_ITEM,
- ECORE_COCOA_CURSOR_DRAG_COPY,
- ECORE_COCOA_CURSOR_DRAG_LINK,
- ECORE_COCOA_CURSOR_IBEAM,
- ECORE_COCOA_CURSOR_OPEN_HAND,
- ECORE_COCOA_CURSOR_OPERATION_NOT_ALLOWED,
- ECORE_COCOA_CURSOR_POINTING_HAND,
- ECORE_COCOA_CURSOR_RESIZE_DOWN,
- ECORE_COCOA_CURSOR_RESIZE_LEFT,
- ECORE_COCOA_CURSOR_RESIZE_LEFT_RIGHT,
- ECORE_COCOA_CURSOR_RESIZE_RIGHT,
- ECORE_COCOA_CURSOR_RESIZE_UP,
- ECORE_COCOA_CURSOR_RESIZE_UP_DOWN,
- ECORE_COCOA_CURSOR_IBEAM_VERTICAL,
-
- __ECORE_COCOA_CURSOR_LAST, /* Sentinel */
-
- ECORE_COCOA_CURSOR_DEFAULT = ECORE_COCOA_CURSOR_ARROW
-
-} Ecore_Cocoa_Cursor;
-
-#endif /* ! __ECORE_COCOA_CURSOR_H__ */
-
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m
b/src/lib/ecore_cocoa/ecore_cocoa_window.m
index aef18da..1914250 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_window.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m
@@ -6,7 +6,6 @@
#include <Ecore.h>
#include <Ecore_Cocoa.h>
-#include <Ecore_Cocoa_Cursor.h>
#import "ecore_cocoa_window.h"
#import "ecore_cocoa_app.h"
#include "ecore_cocoa_private.h"
--
