From bd73a91b55adff133d54affa07a403df945a5afd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 10 Feb 2008 12:56:02 +0000 Subject: [PATCH] fix compilation after last change: wxCFStringRef doesn't exist in 2.8, wxMacCFStringHolder does git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/intl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/intl.cpp b/src/common/intl.cpp index b4583f8514..f7c5ad9cf0 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -2888,7 +2888,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat)) userLocaleRefRaw = CFLocaleCreate ( kCFAllocatorDefault, - wxCFStringRef(wxGetLocale()->GetCanonicalName()) + wxMacCFStringHolder(wxGetLocale()->GetCanonicalName()) ); } 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" ); } - wxCFStringRef + wxMacCFStringHolder str(CFStringCreateCopy(NULL, static_cast(cfstr))); return str.AsString(); }