From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 16 Nov 2007 21:00:08 +0000 (+0000)
Subject: cleanup mac
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1b5dbd344a28a2a8e1318ef068fc8ce324422053

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 58aaf5c018..24ef9a4a1b 100644
--- 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 09e92fc0ad..00436e7679 100644
--- 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;