mac cgcolor changes

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 58aaf5c0184307dc8d534ead0a146ab49a320884..7c8323ab1859ae5d70ef5eb39bc52e411ffd19c6 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -76,9 +76,10 @@
     #include "wx/mac/private.h"  // includes mac headers
 #endif
 
     #include "wx/mac/private.h"  // includes mac headers
 #endif
 

-#if defined(__WXOSX__)
-    #include "wx/mac/corefoundation/cfstring.h"
-    #include "wx/mac/corefoundation/cfref.h"
+#if defined(__DARWIN__)
+       #include "wx/mac/corefoundation/cfref.h"
+       #include <CoreFoundation/CFLocale.h>
+       #include "wx/mac/corefoundation/cfstring.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -2477,11 +2478,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
     }
 #elif defined(__WXMAC__)
     TextEncoding encoding = 0 ;
     }
 #elif defined(__WXMAC__)
     TextEncoding encoding = 0 ;

-#if TARGET_CARBON

     encoding = CFStringGetSystemEncoding() ;
     encoding = CFStringGetSystemEncoding() ;

-#else
-    UpgradeScriptInfoToTextEncoding ( smSystemScript , kTextLanguageDontCare , kTextRegionDontCare , NULL , &encoding ) ;
-#endif

     return wxMacGetFontEncFromSystemEnc( encoding ) ;
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     const wxString encname = GetSystemEncodingName();
     return wxMacGetFontEncFromSystemEnc( encoding ) ;
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     const wxString encname = GetSystemEncodingName();


@@ -2905,7 +2902,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
     return str;
 }
 
     return str;
 }
 

-#elif defined(__WXOSX__)
+#elif defined(__DARWIN__)

 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))


@@ -2931,7 +2928,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
     return str.AsString();
 }
 
     return str.AsString();
 }
 

-#else // !__WXMSW__ && !__WXMAC__
+#else // !__WXMSW__ && !__DARWIN__

 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)