Can't actually test this here, but it looks right...
> Last call (I hope) for this > CGFloat/NSInteger/MAC_OS_X_VERSION_MAX_ALLOWED > business. > > 1) In FL/mac.h, put: > // Standard MacOS Carbon API includes... > #include <Carbon/Carbon.h> > #include <config.h> > > #ifdef __APPLE_COCOA__ > > #ifndef MAC_OS_X_VERSION_10_3 > #define MAC_OS_X_VERSION_10_3 1030 > #endif > #ifndef MAC_OS_X_VERSION_10_4 > #define MAC_OS_X_VERSION_10_4 1040 > #endif > #ifndef MAC_OS_X_VERSION_10_5 > #define MAC_OS_X_VERSION_10_5 1050 > #endif > #ifndef MAC_OS_X_VERSION_10_6 > #define MAC_OS_X_VERSION_10_6 1060 > #endif > #ifndef MAC_OS_X_VERSION_MAX_ALLOWED > #define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_3 > #endif > > #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h > #if defined(__LP64__) && __LP64__ > typedef double CGFloat; > #else > typedef float CGFloat; > #endif > #endif > > #endif > > // Now make some fixes to the headers... > > The starting and ending comments indicate where to place that. > > > 2) In src/Fl_cocoa.mm, we want to obtain: > > #import <Cocoa/Cocoa.h> > > #ifndef NSINTEGER_DEFINED //appears with 10.5 in NSObjCRuntime.h > #if defined(__LP64__) && __LP64__ > typedef long NSInteger; > typedef unsigned long NSUInteger; > #else > typedef int NSInteger; > typedef unsigned int NSUInteger; > #endif > #endif > > // #define DEBUG_SELECT // UNCOMMENT FOR > SELECT()/THREAD DEBUGGING > > The first and last lines indicate where to place that. SELEX Sensors and Airborne Systems Limited Registered Office: Sigma House, Christopher Martin Road, Basildon, Essex SS14 3EL A company registered in England & Wales. Company no. 02426132 ******************************************************************** This email and any attachments are confidential to the intended recipient and may also be privileged. If you are not the intended recipient please delete it from your system and notify the sender. You should not copy it or use it for any purpose nor disclose or distribute its contents to any other person. ******************************************************************** _______________________________________________ fltk-dev mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-dev
