diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h index cbe092463b..8f7b68f2f0 100644 --- a/include/wx/osx/core/cfstring.h +++ b/include/wx/osx/core/cfstring.h @@ -46,12 +46,10 @@ public: wxCFStringRef(const wxString &str, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ; -#if wxOSX_USE_COCOA_OR_IPHONE wxCFStringRef(NSString* ref) : wxCFRef< CFStringRef >((CFStringRef) ref) { } -#endif wxCFStringRef(CFStringRef ref) : wxCFRef< CFStringRef >(ref) @@ -71,14 +69,10 @@ public: static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; static wxString AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; -#if wxOSX_USE_COCOA_OR_IPHONE static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; static wxString AsStringWithNormalizationFormC( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; -#endif -#if wxOSX_USE_COCOA_OR_IPHONE NSString* AsNSString() const { return (NSString*)(CFStringRef) *this; } -#endif private: } ; diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp index 612dc39a5d..8411e9ad2c 100644 --- a/src/osx/core/cfstring.cpp +++ b/src/osx/core/cfstring.cpp @@ -693,7 +693,6 @@ wxString wxCFStringRef::AsString(wxFontEncoding encoding) const return AsString( get(), encoding ); } -#if wxOSX_USE_COCOA_OR_IPHONE wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding ) { return AsString( (CFStringRef) ref, encoding ); @@ -703,8 +702,6 @@ wxString wxCFStringRef::AsStringWithNormalizationFormC( NSString* ref, wxFontEnc { return AsStringWithNormalizationFormC( (CFStringRef) ref, encoding ); } -#endif // wxOSX_USE_COCOA_OR_IPHONE - // // wxMacUniCharBuffer