From f1aa3c1c9a7e1f569d3f571bb3c226f307a652c0 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 12 Nov 2019 15:03:03 +0100 Subject: [PATCH] add bridging info for apps using ARC this is not wx building with -fobjc-arc but for apps using wx --- include/wx/osx/core/cfstring.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h index baaa8bf56d..958fca9ae9 100644 --- a/include/wx/osx/core/cfstring.h +++ b/include/wx/osx/core/cfstring.h @@ -41,9 +41,9 @@ public: wxCFStringRef(const wxString &str, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ; -#ifdef __WXMAC__ +#ifdef __OBJC__ wxCFStringRef(WX_NSString ref) - : wxCFRef< CFStringRef >((CFStringRef) ref) + : wxCFRef< CFStringRef >((__bridge_retained CFStringRef) ref) { } #endif @@ -69,8 +69,9 @@ public: #ifdef __WXMAC__ static wxString AsString( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; static wxString AsStringWithNormalizationFormC( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; - - WX_NSString AsNSString() const { return (WX_NSString)(CFStringRef) *this; } +#endif +#ifdef __OBJC__ + WX_NSString AsNSString() const { return (__bridge WX_NSString)(CFStringRef) *this; } #endif private: } ;