Browse Source

iOS: Remove iOS 12 preprocessor checks

The current minimum-supported Xcode (10.1) includes the iOS 12.1 SDK, so
APIs from iOS 12 will always be available.
v7.0.9
reuk 3 years ago
parent
commit
76e95d01ed
No known key found for this signature in database GPG Key ID: FCB43929F012EE5C
3 changed files with 1 additions and 5 deletions
  1. +1
    -1
      modules/juce_core/native/juce_BasicNativeHeaders.h
  2. +0
    -2
      modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm
  3. +0
    -2
      modules/juce_gui_basics/native/juce_ios_Windowing.mm

+ 1
- 1
modules/juce_core/native/juce_BasicNativeHeaders.h View File

@@ -28,7 +28,7 @@
#if JUCE_MAC || JUCE_IOS #if JUCE_MAC || JUCE_IOS
#if JUCE_IOS #if JUCE_IOS
#if JUCE_MODULE_AVAILABLE_juce_opengl && defined (__IPHONE_12_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0
#if JUCE_MODULE_AVAILABLE_juce_opengl
#define GLES_SILENCE_DEPRECATION 1 #define GLES_SILENCE_DEPRECATION 1
#endif #endif


+ 0
- 2
modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm View File

@@ -773,7 +773,6 @@ MultiTouchMapper<UITouch*> UIViewComponentPeer::currentTouches;
{ {
[super traitCollectionDidChange: previousTraitCollection]; [super traitCollectionDidChange: previousTraitCollection];
#if defined (__IPHONE_12_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0
if (@available (iOS 12.0, *)) if (@available (iOS 12.0, *))
{ {
const auto wasDarkModeActive = ([previousTraitCollection userInterfaceStyle] == UIUserInterfaceStyleDark); const auto wasDarkModeActive = ([previousTraitCollection userInterfaceStyle] == UIUserInterfaceStyleDark);
@@ -782,7 +781,6 @@ MultiTouchMapper<UITouch*> UIViewComponentPeer::currentTouches;
[[NSNotificationCenter defaultCenter] postNotificationName: UIViewComponentPeer::getDarkModeNotificationName() [[NSNotificationCenter defaultCenter] postNotificationName: UIViewComponentPeer::getDarkModeNotificationName()
object: nil]; object: nil];
} }
#endif
} }
- (BOOL) isAccessibilityElement - (BOOL) isAccessibilityElement


+ 0
- 2
modules/juce_gui_basics/native/juce_ios_Windowing.mm View File

@@ -691,10 +691,8 @@ bool Desktop::canUseSemiTransparentWindows() noexcept
bool Desktop::isDarkModeActive() const bool Desktop::isDarkModeActive() const
{ {
#if defined (__IPHONE_12_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0
if (@available (iOS 12.0, *)) if (@available (iOS 12.0, *))
return [[[UIScreen mainScreen] traitCollection] userInterfaceStyle] == UIUserInterfaceStyleDark; return [[[UIScreen mainScreen] traitCollection] userInterfaceStyle] == UIUserInterfaceStyleDark;
#endif
return false; return false;
} }


Loading…
Cancel
Save