diff options
| author | michi_cc <michi_cc@openttd.org> | 2013-08-05 20:38:02 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2013-08-05 20:38:02 +0000 |
| commit | b3ecfbb67ad7954531aa3c52210975b2d57a711d (patch) | |
| tree | db891783d8e2022bb4ea23c4913d7400837d76bc /src/video/cocoa/cocoa_v.h | |
| parent | d15c1c5d4aacb74bbfd6d47700c5b2a2cec368ff (diff) | |
| download | openttd-b3ecfbb67ad7954531aa3c52210975b2d57a711d.tar.xz | |
(svn r25693) -Add: [OSX] Support the new IME functions introduced with 10.5.
Diffstat (limited to 'src/video/cocoa/cocoa_v.h')
| -rw-r--r-- | src/video/cocoa/cocoa_v.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h index 8a964f03b..e70a33b15 100644 --- a/src/video/cocoa/cocoa_v.h +++ b/src/video/cocoa/cocoa_v.h @@ -232,7 +232,17 @@ uint QZ_ListModes(OTTD_Point *modes, uint max_modes, CGDirectDisplayID display_i @end /** Subclass of NSView to fix Quartz rendering and mouse awareness */ -@interface OTTD_CocoaView : NSView <NSTextInput> { +@interface OTTD_CocoaView : NSView +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +# if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 + <NSTextInputClient, NSTextInput> +# else + <NSTextInputClient> +# endif /* MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 */ +#else + <NSTextInput> +#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 */ +{ CocoaSubdriver *driver; NSTrackingRectTag trackingtag; } |