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

create a true empty string and not a null CFStringRef

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-03-25 16:34:55 +00:00
parent 63c4f6da73
commit 2539aa882d
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mac/corefoundation/cfstring.cpp
View File

@@ -635,8 +635,12 @@ void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
{ {
Release() ; Release() ;
if (st.IsEmpty()) if (st.IsEmpty())
return ; {
m_cfs = CFSTR("") ;
CFRetain( m_cfs ) ;
}
else
{
wxString str = st ; wxString str = st ;
wxMacConvertNewlines13To10( &str ) ; wxMacConvertNewlines13To10( &str ) ;
#if wxUSE_UNICODE #if wxUSE_UNICODE
@@ -656,6 +660,7 @@ void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() , m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
wxMacGetSystemEncFromFontEnc( encoding ) ) ; wxMacGetSystemEncFromFontEnc( encoding ) ) ;
#endif #endif
}
m_release = true ; m_release = true ;
} }