diff --git a/BREAKING-CHANGES.txt b/BREAKING-CHANGES.txt index 914ad59f90..80a5bc16e3 100644 --- a/BREAKING-CHANGES.txt +++ b/BREAKING-CHANGES.txt @@ -4,6 +4,27 @@ JUCE breaking changes Develop ======= +Change +------ +The fields representing Mac OS X 10.4 to 10.6 inclusive have been removed from +the `OperatingSystemType` enum. + +Possible Issues +--------------- +Code that uses these fields will fail to build. + +Workaround +---------- +Remove references to these fields from user code. + +Rationale +--------- +JUCE is not supported on Mac OS X versions lower than 10.7, so it is a given +that `getOperatingSystemType` will always return an OS version greater than or +equal to 10.7. Code that changes behaviours depending on the OS version can +assume that this version is at least 10.7. + + Change ------ The JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING flag in juce_graphics is no diff --git a/modules/juce_core/native/juce_mac_SystemStats.mm b/modules/juce_core/native/juce_mac_SystemStats.mm index d3552ddfdd..9665260ed1 100644 --- a/modules/juce_core/native/juce_mac_SystemStats.mm +++ b/modules/juce_core/native/juce_mac_SystemStats.mm @@ -143,7 +143,7 @@ SystemStats::OperatingSystemType SystemStats::getOperatingSystemType() if (major == 10) { jassert (minor > 2); - return (OperatingSystemType) (minor + MacOSX_10_4 - 4); + return (OperatingSystemType) (minor + MacOSX_10_7 - 7); } jassert (major == 11 && minor == 0); @@ -205,10 +205,8 @@ bool SystemStats::isOperatingSystem64Bit() { #if JUCE_IOS return false; - #elif JUCE_64BIT - return true; #else - return getOperatingSystemType() >= MacOSX_10_6; + return true; #endif } diff --git a/modules/juce_core/native/juce_win32_SystemStats.cpp b/modules/juce_core/native/juce_win32_SystemStats.cpp index 83f5dc6210..bbb2424b2b 100644 --- a/modules/juce_core/native/juce_win32_SystemStats.cpp +++ b/modules/juce_core/native/juce_win32_SystemStats.cpp @@ -283,9 +283,6 @@ String SystemStats::getOperatingSystemName() case Android: JUCE_FALLTHROUGH case iOS: JUCE_FALLTHROUGH - case MacOSX_10_4: JUCE_FALLTHROUGH - case MacOSX_10_5: JUCE_FALLTHROUGH - case MacOSX_10_6: JUCE_FALLTHROUGH case MacOSX_10_7: JUCE_FALLTHROUGH case MacOSX_10_8: JUCE_FALLTHROUGH case MacOSX_10_9: JUCE_FALLTHROUGH diff --git a/modules/juce_core/system/juce_SystemStats.h b/modules/juce_core/system/juce_SystemStats.h index 9568a693c5..3260af8e2c 100644 --- a/modules/juce_core/system/juce_SystemStats.h +++ b/modules/juce_core/system/juce_SystemStats.h @@ -52,9 +52,6 @@ public: Android = 0x0800, iOS = 0x1000, - MacOSX_10_4 = MacOSX | 4, - MacOSX_10_5 = MacOSX | 5, - MacOSX_10_6 = MacOSX | 6, MacOSX_10_7 = MacOSX | 7, MacOSX_10_8 = MacOSX | 8, MacOSX_10_9 = MacOSX | 9,