diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h index 66357ab8aa..be024d346f 100644 --- a/include/wx/osx/cocoa/chkconf.h +++ b/include/wx/osx/cocoa/chkconf.h @@ -41,13 +41,10 @@ /* Use the more efficient FSEvents API instead of kqueue - events for file system watcher, but only on OS X >= 10.7 since - that version introduced a flag that allows watching files as - well as sub directories. + events for file system watcher since that version introduced a flag that + allows watching files as well as sub directories. */ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 - #define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1 -#endif +#define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1 /* * turning off capabilities that don't work under cocoa yet diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h index 80b7fe6457..56aef33402 100644 --- a/include/wx/osx/config_xcode.h +++ b/include/wx/osx/config_xcode.h @@ -24,7 +24,6 @@ #define HAVE_VA_COPY 1 #define HAVE_VARIADIC_MACROS 1 #define HAVE_STD_WSTRING 1 -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 #if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 2 ) #if !defined(__has_include) #define HAVE_TR1_UNORDERED_MAP 1 @@ -33,7 +32,6 @@ #endif #define HAVE_GCC_ATOMIC_BUILTINS 1 #endif -#endif #define HAVE_VISIBILITY 1 #define wxHAVE_PTHREAD_CLEANUP 1 #define CONST_COMPATIBILITY 0 diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp index e2d640eebf..c2fa882ced 100644 --- a/src/osx/core/bitmap.cpp +++ b/src/osx/core/bitmap.cpp @@ -495,11 +495,10 @@ IconRef wxBitmapRefData::GetIconRef() switch (sz) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 case 1024: dataType = kIconServices1024PixelDataARGB; break; -#endif + case 512: dataType = kIconServices512PixelDataARGB; break; diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp index a89b043f01..b51184f701 100644 --- a/src/osx/utils_osx.cpp +++ b/src/osx/utils_osx.cpp @@ -63,13 +63,6 @@ bool wxColourDisplay() #if wxOSX_USE_COCOA_OR_CARBON -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) -// bring back declaration so that we can support deployment targets < 10_6 -CG_EXTERN size_t CGDisplayBitsPerPixel(CGDirectDisplayID display) -CG_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_6, - __IPHONE_NA, __IPHONE_NA); -#endif - // Returns depth of screen int wxDisplayDepth() {