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

supporting NSString also in Carbon

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2014-07-04 16:58:03 +00:00
parent 9680ce04e2
commit ec73c71d6a
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,12 +46,10 @@ public:
wxCFStringRef(const wxString &str, wxCFStringRef(const wxString &str,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ; wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ;
#if wxOSX_USE_COCOA_OR_IPHONE
wxCFStringRef(NSString* ref) wxCFStringRef(NSString* ref)
: wxCFRef< CFStringRef >((CFStringRef) ref) : wxCFRef< CFStringRef >((CFStringRef) ref)
{ {
} }
#endif
wxCFStringRef(CFStringRef ref) wxCFStringRef(CFStringRef ref)
: wxCFRef< CFStringRef >(ref) : wxCFRef< CFStringRef >(ref)
@@ -71,14 +69,10 @@ public:
static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
static wxString AsStringWithNormalizationFormC( 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 AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
static wxString AsStringWithNormalizationFormC( 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; } NSString* AsNSString() const { return (NSString*)(CFStringRef) *this; }
#endif
private: private:
} ; } ;

3
src/osx/core/cfstring.cpp
View File

@@ -693,7 +693,6 @@ wxString wxCFStringRef::AsString(wxFontEncoding encoding) const
return AsString( get(), encoding ); return AsString( get(), encoding );
} }
#if wxOSX_USE_COCOA_OR_IPHONE
wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding ) wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding )
{ {
return AsString( (CFStringRef) ref, encoding ); return AsString( (CFStringRef) ref, encoding );
@@ -703,8 +702,6 @@ wxString wxCFStringRef::AsStringWithNormalizationFormC( NSString* ref, wxFontEnc
{ {
return AsStringWithNormalizationFormC( (CFStringRef) ref, encoding ); return AsStringWithNormalizationFormC( (CFStringRef) ref, encoding );
} }
#endif // wxOSX_USE_COCOA_OR_IPHONE
// //
// wxMacUniCharBuffer // wxMacUniCharBuffer