diff options
author | Jean Guyomarc'h <jean@guyomarch.bzh> | 2016-09-27 08:20:20 +0200 |
---|---|---|
committer | Jean Guyomarc'h <jean@guyomarch.bzh> | 2016-09-27 08:52:51 +0200 |
commit | e44c48b90408d2518e2708090796988cfd3cacea (patch) | |
tree | cbbead81224eaad20781c44a098c01bea4eec657 /src/lib/ecore_cocoa/ecore_cocoa_private.h | |
parent | b93947e20646bce2f78a50abf5a076f1a2ae64fd (diff) |
ecore_cocoa: upgrade API to macOS Sierra
Since macOS 10.12, several enumarations have been deprecated in favor of
new ones, with more meaningful ones, which are defined in SDK 10.12.
Diffstat (limited to 'src/lib/ecore_cocoa/ecore_cocoa_private.h')
-rw-r--r-- | src/lib/ecore_cocoa/ecore_cocoa_private.h | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_private.h b/src/lib/ecore_cocoa/ecore_cocoa_private.h index 5a58bf51c3..478cadf57d 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_private.h +++ b/src/lib/ecore_cocoa/ecore_cocoa_private.h | |||
@@ -28,6 +28,39 @@ extern int _ecore_cocoa_log_domain; | |||
28 | #endif | 28 | #endif |
29 | #define CRI(...) EINA_LOG_DOM_CRIT(_ecore_cocoa_log_domain, __VA_ARGS__) | 29 | #define CRI(...) EINA_LOG_DOM_CRIT(_ecore_cocoa_log_domain, __VA_ARGS__) |
30 | 30 | ||
31 | /* | ||
32 | * macOS Sierra (10.12) deprecated enumeration types in profit to others, | ||
33 | * more meaningful ones. | ||
34 | */ | ||
35 | #ifndef __MAC_10_12 | ||
36 | # define NSWindowStyleMaskTitled NSTitledWindowMask | ||
37 | # define NSWindowStyleMaskClosable NSClosableWindowMask | ||
38 | # define NSWindowStyleMaskResizable NSResizableWindowMask | ||
39 | # define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask | ||
40 | # define NSWindowStyleMaskFullScreen NSFullScreenWindowMask | ||
41 | # define NSEventModifierFlagShift NSShiftKeyMask | ||
42 | # define NSEventModifierFlagControl NSControlKeyMask | ||
43 | # define NSEventModifierFlagOption NSAlternateKeyMask | ||
44 | # define NSEventModifierFlagCommand NSCommandKeyMask | ||
45 | # define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask | ||
46 | # define NSEventTypeScrollWheel NSScrollWheel | ||
47 | # define NSEventMaskAny NSAnyEventMask | ||
48 | # define NSEventTypePeriodic NSPeriodic | ||
49 | # define NSEventTypeMouseMoved NSMouseMoved | ||
50 | # define NSEventTypeRightMouseDown NSRightMouseDown | ||
51 | # define NSEventTypeLeftMouseDown NSLeftMouseDown | ||
52 | # define NSEventTypeOtherMouseDown NSOtherMouseDown | ||
53 | # define NSEventTypeLeftMouseUp NSLeftMouseUp | ||
54 | # define NSEventTypeRightMouseUp NSRightMouseUp | ||
55 | # define NSEventTypeOtherMouseUp NSOtherMouseUp | ||
56 | # define NSEventTypeKeyDown NSKeyDown | ||
57 | # define NSEventTypeKeyUp NSKeyUp | ||
58 | # define NSEventTypeFlagsChanged NSFlagsChanged | ||
59 | # define NSEventTypeLeftMouseDragged NSLeftMouseDragged | ||
60 | # define NSEventTypeRightMouseDragged NSRightMouseDragged | ||
61 | # define NSEventTypeOtherMouseDragged NSOtherMouseDragged | ||
62 | # define NSEventModifierFlagNumericPad NSNumericPadKeyMask | ||
63 | #endif | ||
31 | 64 | ||
32 | struct _Ecore_Cocoa_Window | 65 | struct _Ecore_Cocoa_Window |
33 | { | 66 | { |