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

adding conditionals for NSString bridges

Browse Source
This commit is contained in:
Stefan Csomor
2015-08-19 17:39:52 +02:00
parent 0ff96c620f
commit 9b7fd47266
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -693,6 +693,8 @@ wxString wxCFStringRef::AsString(wxFontEncoding encoding) const
return AsString( get(), encoding ); return AsString( get(), encoding );
} }
#ifdef __WXMAC__
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,6 +705,8 @@ wxString wxCFStringRef::AsStringWithNormalizationFormC( NSString* ref, wxFontEnc
return AsStringWithNormalizationFormC( (CFStringRef) ref, encoding ); return AsStringWithNormalizationFormC( (CFStringRef) ref, encoding );
} }
#endif
// //
// wxMacUniCharBuffer // wxMacUniCharBuffer
// //