diff options
author | Jean Guyomarc'h <jean.guyomarch@gmail.com> | 2016-01-06 23:04:33 +0100 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2016-03-02 13:56:35 -0800 |
commit | b21ab5b5419d619fcae411054b7922a73210dd1b (patch) | |
tree | b1c8b87c8f8a1f70b0d23d9af49f824aec66798f | |
parent | e8c17ce341e55a10a74bd01e0ab2e11dc200da74 (diff) |
ecore_cocoa: move Ecore_Cocoa_Cursor.h in Ecore_Cocoa.h
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r-- | src/Makefile_Ecore_Cocoa.am | 3 | ||||
-rw-r--r-- | src/lib/ecore_cocoa/Ecore_Cocoa.h | 34 | ||||
-rw-r--r-- | src/lib/ecore_cocoa/Ecore_Cocoa_Cursor.h | 32 | ||||
-rw-r--r-- | 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 66dc4f7494..1283125d4f 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 | |||
6 | 6 | ||
7 | installed_ecorecocoamainheadersdir = $(includedir)/ecore-cocoa-@VMAJ@ | 7 | installed_ecorecocoamainheadersdir = $(includedir)/ecore-cocoa-@VMAJ@ |
8 | dist_installed_ecorecocoamainheaders_DATA = \ | 8 | dist_installed_ecorecocoamainheaders_DATA = \ |
9 | lib/ecore_cocoa/Ecore_Cocoa.h \ | 9 | lib/ecore_cocoa/Ecore_Cocoa.h |
10 | lib/ecore_cocoa/Ecore_Cocoa_Cursor.h | ||
11 | 10 | ||
12 | lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \ | 11 | lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \ |
13 | lib/ecore_cocoa/ecore_cocoa.m \ | 12 | 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 b9a534a31e..42bc61d88c 100644 --- a/src/lib/ecore_cocoa/Ecore_Cocoa.h +++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h | |||
@@ -34,7 +34,6 @@ | |||
34 | # define EAPI | 34 | # define EAPI |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | #include "Ecore_Cocoa_Cursor.h" | ||
38 | 37 | ||
39 | #ifdef __cplusplus | 38 | #ifdef __cplusplus |
40 | extern "C" { | 39 | extern "C" { |
@@ -84,6 +83,39 @@ typedef struct _Ecore_Cocoa_Event_Window_Unfocused Ecore_Cocoa_Event_Window_Unfo | |||
84 | */ | 83 | */ |
85 | typedef struct _Ecore_Cocoa_Event_Window_Destroy Ecore_Cocoa_Event_Window_Destroy; | 84 | typedef struct _Ecore_Cocoa_Event_Window_Destroy Ecore_Cocoa_Event_Window_Destroy; |
86 | 85 | ||
86 | /** | ||
87 | * @typedef Ecore_Cocoa_Cursor | ||
88 | * Values of the Cocoa cursors handled by Ecore_Cocoa | ||
89 | * See https://developer.apple.com/library/mac/documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/index.html for images of each cursors. | ||
90 | */ | ||
91 | typedef enum | ||
92 | { | ||
93 | ECORE_COCOA_CURSOR_ARROW = 0, /**< Arrow cursor */ | ||
94 | ECORE_COCOA_CURSOR_CONTEXTUAL_MENU, /**< Contextual menu cursor */ | ||
95 | ECORE_COCOA_CURSOR_CLOSED_HAND, /**< Closed hand cursor */ | ||
96 | ECORE_COCOA_CURSOR_CROSSHAIR, /**< Crosshair cursor */ | ||
97 | ECORE_COCOA_CURSOR_DISAPPEARING_ITEM, /**< Disappearing item cursor */ | ||
98 | ECORE_COCOA_CURSOR_DRAG_COPY, /** Drag copy cursor */ | ||
99 | ECORE_COCOA_CURSOR_DRAG_LINK, /**< Drag link cursor */ | ||
100 | ECORE_COCOA_CURSOR_IBEAM, /**< IBeam cursor */ | ||
101 | ECORE_COCOA_CURSOR_OPEN_HAND, /**< Open hand cursor */ | ||
102 | ECORE_COCOA_CURSOR_OPERATION_NOT_ALLOWED, /**< Operation not allowed cursor */ | ||
103 | ECORE_COCOA_CURSOR_POINTING_HAND, /**< Pointing hand cursor */ | ||
104 | ECORE_COCOA_CURSOR_RESIZE_DOWN, /**< Resize down cursor */ | ||
105 | ECORE_COCOA_CURSOR_RESIZE_LEFT, /**< Resize left cursor */ | ||
106 | ECORE_COCOA_CURSOR_RESIZE_LEFT_RIGHT, /**< Resize left right cursor */ | ||
107 | ECORE_COCOA_CURSOR_RESIZE_RIGHT, /**< Resize right cursor */ | ||
108 | ECORE_COCOA_CURSOR_RESIZE_UP, /**< Resize up cursor */ | ||
109 | ECORE_COCOA_CURSOR_RESIZE_UP_DOWN, /**< Resize up down cursor */ | ||
110 | ECORE_COCOA_CURSOR_IBEAM_VERTICAL, /**< IBeam vertical cursor */ | ||
111 | |||
112 | __ECORE_COCOA_CURSOR_LAST, /**< Sentinel. DO NOT USE */ | ||
113 | |||
114 | ECORE_COCOA_CURSOR_DEFAULT = ECORE_COCOA_CURSOR_ARROW /**< Default Cocoa cursor */ | ||
115 | |||
116 | } Ecore_Cocoa_Cursor; | ||
117 | |||
118 | |||
87 | /** Event triggered when a Cocoa window receives focus */ | 119 | /** Event triggered when a Cocoa window receives focus */ |
88 | EAPI extern int ECORE_COCOA_EVENT_WINDOW_FOCUSED; | 120 | EAPI extern int ECORE_COCOA_EVENT_WINDOW_FOCUSED; |
89 | 121 | ||
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 6bca47f6aa..0000000000 --- a/src/lib/ecore_cocoa/Ecore_Cocoa_Cursor.h +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | #ifndef __ECORE_COCOA_CURSOR_H__ | ||
2 | #define __ECORE_COCOA_CURSOR_H__ | ||
3 | |||
4 | typedef enum | ||
5 | { | ||
6 | ECORE_COCOA_CURSOR_ARROW = 0, | ||
7 | ECORE_COCOA_CURSOR_CONTEXTUAL_MENU, | ||
8 | ECORE_COCOA_CURSOR_CLOSED_HAND, | ||
9 | ECORE_COCOA_CURSOR_CROSSHAIR, | ||
10 | ECORE_COCOA_CURSOR_DISAPPEARING_ITEM, | ||
11 | ECORE_COCOA_CURSOR_DRAG_COPY, | ||
12 | ECORE_COCOA_CURSOR_DRAG_LINK, | ||
13 | ECORE_COCOA_CURSOR_IBEAM, | ||
14 | ECORE_COCOA_CURSOR_OPEN_HAND, | ||
15 | ECORE_COCOA_CURSOR_OPERATION_NOT_ALLOWED, | ||
16 | ECORE_COCOA_CURSOR_POINTING_HAND, | ||
17 | ECORE_COCOA_CURSOR_RESIZE_DOWN, | ||
18 | ECORE_COCOA_CURSOR_RESIZE_LEFT, | ||
19 | ECORE_COCOA_CURSOR_RESIZE_LEFT_RIGHT, | ||
20 | ECORE_COCOA_CURSOR_RESIZE_RIGHT, | ||
21 | ECORE_COCOA_CURSOR_RESIZE_UP, | ||
22 | ECORE_COCOA_CURSOR_RESIZE_UP_DOWN, | ||
23 | ECORE_COCOA_CURSOR_IBEAM_VERTICAL, | ||
24 | |||
25 | __ECORE_COCOA_CURSOR_LAST, /* Sentinel */ | ||
26 | |||
27 | ECORE_COCOA_CURSOR_DEFAULT = ECORE_COCOA_CURSOR_ARROW | ||
28 | |||
29 | } Ecore_Cocoa_Cursor; | ||
30 | |||
31 | #endif /* ! __ECORE_COCOA_CURSOR_H__ */ | ||
32 | |||
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m index aef18da06e..191425064e 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_window.m +++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m | |||
@@ -6,7 +6,6 @@ | |||
6 | 6 | ||
7 | #include <Ecore.h> | 7 | #include <Ecore.h> |
8 | #include <Ecore_Cocoa.h> | 8 | #include <Ecore_Cocoa.h> |
9 | #include <Ecore_Cocoa_Cursor.h> | ||
10 | #import "ecore_cocoa_window.h" | 9 | #import "ecore_cocoa_window.h" |
11 | #import "ecore_cocoa_app.h" | 10 | #import "ecore_cocoa_app.h" |
12 | #include "ecore_cocoa_private.h" | 11 | #include "ecore_cocoa_private.h" |