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

cleaning up common OSX code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-03-07 16:54:12 +00:00
parent c8e2c7d7b3
commit 73b51ea436
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/intl.cpp
View File

@@ -72,10 +72,6 @@
#include "wx/hashset.h" #include "wx/hashset.h"
#include "wx/filesys.h" #include "wx/filesys.h"
#if defined(__WXMAC__)
#include "wx/mac/private.h" // includes mac headers
#endif
#if defined(__DARWIN__) #if defined(__DARWIN__)
#include "wx/mac/corefoundation/cfref.h" #include "wx/mac/corefoundation/cfref.h"
#include <CoreFoundation/CFLocale.h> #include <CoreFoundation/CFLocale.h>
@@ -2237,7 +2233,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
return wxFONTENCODING_CP950; return wxFONTENCODING_CP950;
} }
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
TextEncoding encoding = 0 ; CFStringEncoding encoding = 0 ;
encoding = CFStringGetSystemEncoding() ; encoding = CFStringGetSystemEncoding() ;
return wxMacGetFontEncFromSystemEnc( encoding ) ; return wxMacGetFontEncFromSystemEnc( encoding ) ;
#elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
@@ -2677,23 +2673,24 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
wxCFRef<CFLocaleRef> userLocaleRef(userLocaleRefRaw); wxCFRef<CFLocaleRef> userLocaleRef(userLocaleRefRaw);
CFTypeRef cfstr; CFStringRef cfstr = 0;
switch ( index ) switch ( index )
{ {
case wxLOCALE_THOUSANDS_SEP: case wxLOCALE_THOUSANDS_SEP:
cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator); cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);
break; break;
case wxLOCALE_DECIMAL_POINT: case wxLOCALE_DECIMAL_POINT:
cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator); cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);
break; break;
default: default:
wxFAIL_MSG( "Unknown locale info" ); wxFAIL_MSG( "Unknown locale info" );
cfstr = CFSTR("");
break;
} }
wxCFStringRef wxCFStringRef str(wxCFRetain(cfstr));
str(CFStringCreateCopy(NULL, static_cast<CFStringRef>(cfstr)));
return str.AsString(); return str.AsString();
} }