Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add bridging info for apps using ARC

Browse Source 
this is not wx building with -fobjc-arc but for apps using wx
This commit is contained in:
Stefan Csomor
2019-11-12 15:03:03 +01:00
parent df9f4af357
commit f1aa3c1c9a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/osx/core/cfstring.h
View File

@@ -41,9 +41,9 @@ public:
wxCFStringRef(const wxString &str, wxCFStringRef(const wxString &str,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ; wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ;
#ifdef __WXMAC__ #ifdef __OBJC__
wxCFStringRef(WX_NSString ref) wxCFStringRef(WX_NSString ref)
: wxCFRef< CFStringRef >((CFStringRef) ref) : wxCFRef< CFStringRef >((__bridge_retained CFStringRef) ref)
{ {
} }
#endif #endif
@@ -69,8 +69,9 @@ public:
#ifdef __WXMAC__ #ifdef __WXMAC__
static wxString AsString( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; static wxString AsString( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
static wxString AsStringWithNormalizationFormC( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; static wxString AsStringWithNormalizationFormC( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
#endif
WX_NSString AsNSString() const { return (WX_NSString)(CFStringRef) *this; } #ifdef __OBJC__
WX_NSString AsNSString() const { return (__bridge WX_NSString)(CFStringRef) *this; }
#endif #endif
private: private:
} ; } ;