cleanup mac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 58aaf5c0184307dc8d534ead0a146ab49a320884..24ef9a4a1b6d45bf79998e317e9f5dcab109bdfe 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -76,11 +76,6 @@
     #include "wx/mac/private.h"  // includes mac headers
 #endif
 
-#if defined(__WXOSX__)
-    #include "wx/mac/corefoundation/cfstring.h"
-    #include "wx/mac/corefoundation/cfref.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------
@@ -2477,11 +2472,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
     }
 #elif defined(__WXMAC__)
     TextEncoding encoding = 0 ;
-#if TARGET_CARBON
     encoding = CFStringGetSystemEncoding() ;
-#else
-    UpgradeScriptInfoToTextEncoding ( smSystemScript , kTextLanguageDontCare , kTextRegionDontCare , NULL , &encoding ) ;
-#endif
     return wxMacGetFontEncFromSystemEnc( encoding ) ;
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     const wxString encname = GetSystemEncodingName();

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 09e92fc0add4a03c1dd70d2ddb5708697c6822a4..00436e76790dc3c0cd5775e95a1920bb422c0ea7 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1055,9 +1055,6 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
     err = ICStart(&inst, 'STKA'); // put your app creator code here
     if (err == noErr)
     {
-#if !TARGET_CARBON
-        err = ICFindConfigFile(inst, 0, NULL);
-#endif
         if (err == noErr)
         {
             ConstStr255Param hint = 0;