Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of macOS 10.7 version checks, they're always true

Browse Source 
We don't support OS X < 10.7 anyhow any more.
This commit is contained in:
Vadim Zeitlin
2016-11-26 17:28:12 +01:00
parent 2638869fc7
commit 50190395c6
4 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/osx/cocoa/chkconf.h
View File

@@ -41,13 +41,10 @@
/* /*
Use the more efficient FSEvents API instead of kqueue Use the more efficient FSEvents API instead of kqueue
events for file system watcher, but only on OS X >= 10.7 since events for file system watcher since that version introduced a flag that
that version introduced a flag that allows watching files as allows watching files as well as sub directories.
well as sub directories.
*/ */
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
#define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1 #define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1
#endif
/* /*
* turning off capabilities that don't work under cocoa yet * turning off capabilities that don't work under cocoa yet

2
include/wx/osx/config_xcode.h
View File

@@ -24,7 +24,6 @@
#define HAVE_VA_COPY 1 #define HAVE_VA_COPY 1
#define HAVE_VARIADIC_MACROS 1 #define HAVE_VARIADIC_MACROS 1
#define HAVE_STD_WSTRING 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 __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 2 )
#if !defined(__has_include) #if !defined(__has_include)
#define HAVE_TR1_UNORDERED_MAP 1 #define HAVE_TR1_UNORDERED_MAP 1
@@ -33,7 +32,6 @@
#endif #endif
#define HAVE_GCC_ATOMIC_BUILTINS 1 #define HAVE_GCC_ATOMIC_BUILTINS 1
#endif #endif
#endif
#define HAVE_VISIBILITY 1 #define HAVE_VISIBILITY 1
#define wxHAVE_PTHREAD_CLEANUP 1 #define wxHAVE_PTHREAD_CLEANUP 1
#define CONST_COMPATIBILITY 0 #define CONST_COMPATIBILITY 0

3
src/osx/core/bitmap.cpp
View File

@@ -495,11 +495,10 @@ IconRef wxBitmapRefData::GetIconRef()
switch (sz) switch (sz)
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
case 1024: case 1024:
dataType = kIconServices1024PixelDataARGB; dataType = kIconServices1024PixelDataARGB;
break; break;
#endif
case 512: case 512:
dataType = kIconServices512PixelDataARGB; dataType = kIconServices512PixelDataARGB;
break; break;

7
src/osx/utils_osx.cpp
View File

@@ -63,13 +63,6 @@ bool wxColourDisplay()
#if wxOSX_USE_COCOA_OR_CARBON #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 // Returns depth of screen
int wxDisplayDepth() int wxDisplayDepth()
{ {