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

fix compilation after last change: wxCFStringRef doesn't exist in 2.8, wxMacCFStringHolder does

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-10 12:56:02 +00:00
parent e0c3d1e0d5
commit bd73a91b55
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/intl.cpp
View File

@@ -2888,7 +2888,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
userLocaleRefRaw = CFLocaleCreate userLocaleRefRaw = CFLocaleCreate
( (
kCFAllocatorDefault, kCFAllocatorDefault,
wxCFStringRef(wxGetLocale()->GetCanonicalName()) wxMacCFStringHolder(wxGetLocale()->GetCanonicalName())
); );
} }
else // no current locale, use the default one else // no current locale, use the default one
@@ -2913,7 +2913,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
wxFAIL_MSG( "Unknown locale info" ); wxFAIL_MSG( "Unknown locale info" );
} }
wxCFStringRef wxMacCFStringHolder
str(CFStringCreateCopy(NULL, static_cast<CFStringRef>(cfstr))); str(CFStringCreateCopy(NULL, static_cast<CFStringRef>(cfstr)));
return str.AsString(); return str.AsString();
} }