diff options
Diffstat (limited to 'src/video/cocoa/event.mm')
| -rw-r--r-- | src/video/cocoa/event.mm | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm index dea4eb8b5..db5f7b893 100644 --- a/src/video/cocoa/event.mm +++ b/src/video/cocoa/event.mm @@ -8,34 +8,14 @@ #ifdef WITH_COCOA -#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 -#include <AvailabilityMacros.h> +#include "../../stdafx.h" +#define Rect OTTDRect +#define Point OTTDPoint #import <Cocoa/Cocoa.h> -#import <sys/time.h> /* gettimeofday */ -#import <sys/param.h> /* for MAXPATHLEN */ -#import <unistd.h> - -/** - * Important notice regarding all modifications!!!!!!! - * There are certain limitations because the file is objective C++. - * gdb has limitations. - * C++ and objective C code can't be joined in all cases (classes stuff). - * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. - */ - - -/* Defined in stdbool.h */ -#ifndef __cplusplus -# ifndef __BEOS__ -# undef bool -# undef false -# undef true -# endif -#endif +#undef Rect +#undef Point - -#include "../../stdafx.h" #include "../../openttd.h" #include "../../debug.h" #include "../../os/macosx/splash.h" @@ -50,6 +30,16 @@ #include "../../core/random_func.hpp" #include "../../texteff.hpp" +#import <sys/time.h> /* gettimeofday */ + +/** + * Important notice regarding all modifications!!!!!!! + * There are certain limitations because the file is objective C++. + * gdb has limitations. + * C++ and objective C code can't be joined in all cases (classes stuff). + * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. + */ + /* Right Mouse Button Emulation enum */ enum { |