diff --git a/include/wx/osx/core/cfref.h b/include/wx/osx/core/cfref.h index be349c08e7..56a0697f3f 100644 --- a/include/wx/osx/core/cfref.h +++ b/include/wx/osx/core/cfref.h @@ -21,6 +21,14 @@ // Include AvailabilityMacros for DEPRECATED_ATTRIBUTE #include +#if __has_feature(objc_arc) +#define WX_OSX_BRIDGE_RETAINED __bridge_retained +#define WX_OSX_BRIDGE __bridge +#else +#define WX_OSX_BRIDGE_RETAINED +#define WX_OSX_BRIDGE +#endif + // #include /* Don't include CFBase.h such that this header can be included from public * headers with minimal namespace pollution. diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h index 958fca9ae9..e74423ecea 100644 --- a/include/wx/osx/core/cfstring.h +++ b/include/wx/osx/core/cfstring.h @@ -43,7 +43,7 @@ public: #ifdef __OBJC__ wxCFStringRef(WX_NSString ref) - : wxCFRef< CFStringRef >((__bridge_retained CFStringRef) ref) + : wxCFRef< CFStringRef >((WX_OSX_BRIDGE_RETAINED CFStringRef) ref) { } #endif @@ -71,7 +71,7 @@ public: static wxString AsStringWithNormalizationFormC( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; #endif #ifdef __OBJC__ - WX_NSString AsNSString() const { return (__bridge WX_NSString)(CFStringRef) *this; } + WX_NSString AsNSString() const { return (WX_OSX_BRIDGE WX_NSString)(CFStringRef) *this; } #endif private: } ;