X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe1a36a70c2f5ed8a6f9ea0b82005ebb987e5860..c564ca3c975aba89f8b911ace0f240c0aaf4cf73:/include/wx/osx/chkconf.h diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h index 755cc8c985..98e950215f 100644 --- a/include/wx/osx/chkconf.h +++ b/include/wx/osx/chkconf.h @@ -21,38 +21,33 @@ # define wxUSE_STACKWALKER 0 #endif /* wxUSE_STACKWALKER */ -/* - * disable the settings which don't work for some compilers - */ - -#if defined(__MWERKS__) - #undef wxUSE_DEBUG_NEW_ALWAYS - #define wxUSE_DEBUG_NEW_ALWAYS 0 - - /* DS: Fixes compilation when wxUSE_ON_FATAL_EXCEPTION is 1 */ - #ifndef wxTYPE_SA_HANDLER - #define wxTYPE_SA_HANDLER int - #endif -#endif - /* * check graphics context option, must be on for every os x platform * we only use core graphics now on all builds, try to catch attempts * to configure the build otherwise and give error messages */ - -#if !wxUSE_GRAPHICS_CONTEXT || ( defined( wxMAC_USE_CORE_GRAPHICS ) && !wxMAC_USE_CORE_GRAPHICS ) + +#if wxUSE_GUI && (!wxUSE_GRAPHICS_CONTEXT || \ + ( defined( wxMAC_USE_CORE_GRAPHICS ) && !wxMAC_USE_CORE_GRAPHICS )) # error "OS X builds use CoreGraphics in this wx version, you cannot turn back to QuickDraw completely" #endif /* * using mixins of cocoa functionality */ - -#ifndef wxOSX_USE_COCOA + +#ifdef __WXOSX_COCOA__ + #define wxOSX_USE_COCOA 1 +#else #define wxOSX_USE_COCOA 0 #endif +#ifdef __WXOSX_CARBON__ + #define wxOSX_USE_CARBON 1 +#else + #define wxOSX_USE_CARBON 0 +#endif + /* * setting flags according to the platform */ @@ -62,26 +57,22 @@ #undef wxOSX_USE_COCOA #define wxOSX_USE_COCOA 1 #endif - #define wxOSX_USE_CARBON 0 + #if wxOSX_USE_CARBON + #error "Carbon does not support 64bit" + #endif #define wxOSX_USE_IPHONE 0 #else #ifdef __WXOSX_IPHONE__ - #define wxOSX_USE_CARBON 0 #define wxOSX_USE_IPHONE 1 #else #define wxOSX_USE_IPHONE 0 - #if wxOSX_USE_COCOA - #define wxOSX_USE_CARBON 0 - #else - #define wxOSX_USE_CARBON 1 - #endif #endif #endif /* * combination flags */ - + #if wxOSX_USE_COCOA || wxOSX_USE_CARBON #define wxOSX_USE_COCOA_OR_CARBON 1 #else @@ -102,4 +93,4 @@ #include "wx/osx/cocoa/chkconf.h" #endif -#endif // _WX_OSX_CHKCONF_H_ \ No newline at end of file +#endif /* _WX_OSX_CHKCONF_H_ */