From 613ddb7e3c912185037a6e4687d564393fea26da Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Fri, 26 Jul 2024 03:38:45 +0800 Subject: [PATCH 11/13] cfstring: fix --- include/wx/osx/core/cfstring.h | 8 ++++---- src/osx/core/cfstring.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h index 6468713139..cf744d0b0b 100644 --- a/include/wx/osx/core/cfstring.h +++ b/include/wx/osx/core/cfstring.h @@ -66,11 +66,10 @@ public: static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; static wxString AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; -#ifdef __WXMAC__ +#ifdef __OBJC__ static wxString AsString( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; static wxString AsStringWithNormalizationFormC( WX_NSString ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; -#endif -#ifdef __OBJC__ + WX_NSString AsNSString() const { return (WX_OSX_BRIDGE WX_NSString)(CFStringRef) *this; } #endif private: @@ -87,7 +86,7 @@ inline wxCFStringRef wxCFStringRefFromGet(CFStringRef p) return wxCFStringRef(wxCFRetain(p)); } -#ifdef __WXMAC__ +#ifdef __OBJC__ /*! @function wxCFStringRefFromGet @abstract Factory function to create wxCFStringRefRef from a NSString* obtained from a Get-rule function @param p The NSString pointer to retain and create a wxCFStringRefRef from. May be NULL. @@ -98,6 +97,7 @@ inline wxCFStringRef wxCFStringRefFromGet(NSString *p) { return wxCFStringRefFromGet((WX_OSX_BRIDGE CFStringRef)p); } + #endif #endif //__WXCFSTRINGHOLDER_H__ diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp index 977b316282..23153fbb36 100644 --- a/src/osx/core/cfstring.cpp +++ b/src/osx/core/cfstring.cpp @@ -688,7 +688,7 @@ wxString wxCFStringRef::AsString(wxFontEncoding encoding) const return AsString( get(), encoding ); } -#ifdef __WXMAC__ +#ifdef __OBJC__ wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding ) { -- 2.49.0