cleanup mac

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

diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp
index fedc3982f09c9c6e554196085e0ae149780fd834..0348da365fd321744ba301284d28a7dadd051928 100644 (file)
--- a/src/mac/corefoundation/stdpaths_cf.cpp
+++ b/src/mac/corefoundation/stdpaths_cf.cpp
@@ -32,19 +32,10 @@
 #endif
 #include "wx/mac/corefoundation/cfstring.h"
 
-#if defined(__DARWIN__)
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFURL.h>
-#else
-#include <CFBundle.h>
-#include <CFURL.h>
-#endif
 
-#if defined(__WXCOCOA__) || defined(__WXMAC_OSX__)
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
-#else
-#define kDefaultPathStyle kCFURLHFSPathStyle
-#endif
 
 // ============================================================================
 // implementation

diff --git a/src/mac/corefoundation/strconv_cf.cpp b/src/mac/corefoundation/strconv_cf.cpp
index 1aad21c2983da639b5dba0d709305af619609cd5..e68d8e4ef6af34cc614ea77ffed0fd2427dc4c74 100644 (file)
--- a/src/mac/corefoundation/strconv_cf.cpp
+++ b/src/mac/corefoundation/strconv_cf.cpp
@@ -57,7 +57,6 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
         return result;
 }
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
 // Provide a constant for the wchat_t encoding used by the host platform.
 #ifdef WORDS_BIGENDIAN
     static const CFStringEncoding wxCFStringEncodingWcharT = kCFStringEncodingUTF32BE;
@@ -65,8 +64,6 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
     static const CFStringEncoding wxCFStringEncodingWcharT = kCFStringEncodingUTF32LE;
 #endif
 
-#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 */
-
     size_t wxMBConv_cf::ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize) const
     {
         wxCHECK(src, wxCONV_FAILED);
@@ -101,7 +98,6 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
  * to UTF32.  If we are then run against a pre-Tiger system, the encoding
  * won't be available so we'll defer to the string->UTF-16->UTF-32 conversion.
  */
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
         if(CFStringIsEncodingAvailable(wxCFStringEncodingWcharT))
         {
             CFRange fullStringRange = CFRangeMake(0, CFStringGetLength(theString));
@@ -132,7 +128,6 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
             return usedBufLen / sizeof(wchar_t);
         }
         else
-#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 */
         {
             // NOTE: Includes NULL iff source did
             /* NOTE: This is an approximation.  The eventual UTF-32 will    
@@ -175,7 +170,6 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
  * from UTF32.  If we are then run against a pre-Tiger system, the encoding
  * won't be available so we'll defer to the UTF-32->UTF-16->string conversion.
  */
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
         if(CFStringIsEncodingAvailable(wxCFStringEncodingWcharT))
         {
             theString = wxCFRef<CFStringRef>(CFStringCreateWithBytes(
@@ -186,7 +180,6 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
                     false));
         }
         else
-#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 */
         {
             wxMBConvUTF16 converter;
             size_t cbUniBuffer = converter.FromWChar( NULL, 0, src, srcSize );

diff --git a/src/mac/corefoundation/utilsexc_base.cpp b/src/mac/corefoundation/utilsexc_base.cpp
index 09c7d8f1bc984a1a3e8274d145bc0e12ca51feea..b1ed128295459e88fc6f99d51fa52858d92b68e3 100644 (file)
--- a/src/mac/corefoundation/utilsexc_base.cpp
+++ b/src/mac/corefoundation/utilsexc_base.cpp
@@ -40,11 +40,7 @@
 #include "wx/mac/corefoundation/cfstring.h"
 
 // Default path style
-#ifdef __WXMAC_OSX__
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
-#else
-#define kDefaultPathStyle kCFURLHFSPathStyle
-#endif
 
 //===========================================================================
 //  IMPLEMENTATION