Bump minimum macOS version to 10.14

See #800 for immediate motivation.
vslavik · Aug 31, 2023 · afe1fe8 · afe1fe8
1 parent 1b0940b
commit afe1fe8
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 62 deletions.
diff --git a/Poedit.xcodeproj/project.pbxproj b/Poedit.xcodeproj/project.pbxproj
@@ -1801,7 +1801,7 @@
 					"$(DEPS_BUILD_DIR)/icu/include",
 				);
 				LIBRARY_SEARCH_PATHS = "$(DEPS_BUILD_DIR)/icu/lib";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				POEDIT_FEATURES = "";
@@ -1875,7 +1875,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(DEPS_BUILD_DIR)/icu/lib";
 				LLVM_LTO = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				POEDIT_FEATURES = "";
 				POEDIT_VERSION = 3.3.2;
 				SDKROOT = macosx;

diff --git a/deps/custom_build/third_party.xcconfig b/deps/custom_build/third_party.xcconfig
@@ -1,5 +1,5 @@
 
-MACOSX_DEPLOYMENT_TARGET = 10.13
+MACOSX_DEPLOYMENT_TARGET = 10.14
 
 SKIP_INSTALL = YES
 COPY_PHASE_STRIP = NO

diff --git a/deps/custom_build/wxcocoa.xcconfig b/deps/custom_build/wxcocoa.xcconfig
@@ -3,7 +3,7 @@ WXTOOLKITUPPER = COCOA
 
 #include "wx.xcconfig"
 
-MACOSX_DEPLOYMENT_TARGET = 10.13
+MACOSX_DEPLOYMENT_TARGET = 10.14
 
 GCC_VERSION =
 

diff --git a/src/colorscheme.cpp b/src/colorscheme.cpp
@@ -50,15 +50,8 @@ inline wxColour sRGB(int r, int g, int b, double a = 1.0)
 
 inline bool IsDarkAppearance(NSAppearance *appearance)
 {
-    if (@available(macOS 10.14, *))
-    {
-        NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
-        return [appearanceName isEqualToString:NSAppearanceNameDarkAqua];
-    }
-    else
-    {
-        return false;
-    }
+    NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
+    return [appearanceName isEqualToString:NSAppearanceNameDarkAqua];
 }
 
 #else
@@ -264,10 +257,7 @@ ColorScheme::Mode ColorScheme::GetAppMode()
     if (!s_appModeDetermined)
     {
 #ifdef __WXOSX__
-        if (@available(macOS 10.14, *))
-            s_appMode = IsDarkAppearance(NSApp.effectiveAppearance) ? Dark : Light;
-        else
-            s_appMode = Light;
+        s_appMode = IsDarkAppearance(NSApp.effectiveAppearance) ? Dark : Light;
 #else
         auto colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
     #if wxCHECK_VERSION(3,1,3)

diff --git a/src/custom_buttons.cpp b/src/custom_buttons.cpp
@@ -73,8 +73,8 @@
     {
         self.title = label;
         self.heading = heading;
-        self.buttonType = NSMomentaryPushInButton;
-        self.bezelStyle = NSTexturedRoundedBezelStyle;
+        self.buttonType = NSButtonTypeMomentaryPushIn;
+        self.bezelStyle = NSBezelStyleTexturedRounded;
         self.showsBorderOnlyWhileMouseInside = YES;
         self.mouseHover = NO;
     }
@@ -97,13 +97,9 @@
     NSColor *bg = self.window.backgroundColor;
     if (self.mouseHover)
     {
-        if (@available(macOS 10.14, *)) {
-            NSColor *highlight = [bg colorWithSystemEffect:NSColorSystemEffectRollover];
-            // use only lighter version of the highlight by blending with the background
-            bg = [bg blendedColorWithFraction:0.2 ofColor:highlight];
-        } else {
-            bg = [NSColor colorWithWhite:0.9 alpha:1.0];
-        }
+        NSColor *highlight = [bg colorWithSystemEffect:NSColorSystemEffectRollover];
+        // use only lighter version of the highlight by blending with the background
+        bg = [bg blendedColorWithFraction:0.2 ofColor:highlight];
     }
     [StyleKit drawActionButtonWithFrame:self.bounds
                             buttonColor:bg
@@ -172,8 +168,8 @@ ActionButton::ActionButton(wxWindow *parent, wxWindowID winid, const wxString& s
     if (self)
     {
         self.title = label;
-        self.bezelStyle = NSSmallSquareBezelStyle;
-        self.buttonType = NSOnOffButton;
+        self.bezelStyle = NSBezelStyleSmallSquare;
+        self.buttonType = NSButtonTypeOnOff;
         self.font = [NSFont boldSystemFontOfSize:[NSFont smallSystemFontSize]];
         self.animationPosition = 0.0;
         self.onColor = [NSColor colorWithCalibratedRed:0.302 green:0.847 blue:0.396 alpha:1.0];
@@ -221,13 +217,13 @@ ActionButton::ActionButton(wxWindow *parent, wxWindowID winid, const wxString& s
     if (state == self.state)
         return;
     [super setState:state];
-    self.animationPosition = (state == NSOnState) ? 1.0 : 0.0;
+    self.animationPosition = (state == NSControlStateValueOn) ? 1.0 : 0.0;
 }
 
 - (void)controlAction:(id)sender
 {
     #pragma unused(sender)
-    double target = (self.state == NSOnState) ? 1.0 : 0.0;
+    double target = (self.state == NSControlStateValueOn) ? 1.0 : 0.0;
 
     [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context)
     {
@@ -261,12 +257,12 @@ class SwitchButton::impl
 
     void SetValue(bool value)
     {
-        m_view.state = value ? NSOnState : NSOffState;
+        m_view.state = value ? NSControlStateValueOn : NSControlStateValueOff;
     }
 
     bool GetValue() const
     {
-        return m_view.state == NSOnState;
+        return m_view.state == NSControlStateValueOn;
     }
 
 private:
@@ -574,8 +570,8 @@ bool SwitchButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
     if (self)
     {
         self.title = label;
-        self.bezelStyle = NSRoundRectBezelStyle;
-        self.buttonType = NSMomentaryPushInButton;
+        self.bezelStyle = NSBezelStyleRoundRect;
+        self.buttonType = NSButtonTypeMomentaryPushIn;
         self.font = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]];
     }
     return self;

diff --git a/src/customcontrols.cpp b/src/customcontrols.cpp
@@ -328,21 +328,16 @@ LearnMoreLink::LearnMoreLink(wxWindow *parent, const wxString& url, wxString lab
     wxHyperlinkCtrl::Create(parent, winid, label, url);
 
 #ifdef __WXOSX__
-    if (@available(macOS 10.14, *))
-    {
-        wxColour normal(NSColor.linkColor);
-        wxColour hover([NSColor.linkColor colorWithSystemEffect:NSColorSystemEffectRollover]);
-        SetNormalColour(normal);
-        SetVisitedColour(normal);
-        SetHoverColour(hover);
-    }
-    else
+    wxColour normal(NSColor.linkColor);
+    wxColour hover([NSColor.linkColor colorWithSystemEffect:NSColorSystemEffectRollover]);
+    SetNormalColour(normal);
+    SetVisitedColour(normal);
+    SetHoverColour(hover);
+#else
+    SetNormalColour("#2F79BE");
+    SetVisitedColour("#2F79BE");
+    SetHoverColour("#3D8DD5");
 #endif
-    {
-        SetNormalColour("#2F79BE");
-        SetVisitedColour("#2F79BE");
-        SetHoverColour("#3D8DD5");
-    }
 
 #ifdef __WXOSX__
     SetWindowVariant(wxWINDOW_VARIANT_SMALL);
@@ -470,7 +465,7 @@ ImageButton::ImageButton(wxWindow *parent, const wxString& bitmapName)
 #ifdef __WXOSX__
     // don't light up the background when clicked:
     NSButton *view = (NSButton*)GetHandle();
-    view.buttonType = NSMomentaryChangeButton;
+    view.buttonType = NSButtonTypeMomentaryChange;
 #else
     // refresh template icons on theme change (macOS handles automatically):
     if (bitmapName.EndsWith("Template"))

diff --git a/src/fileviewer.cpp b/src/fileviewer.cpp
@@ -132,7 +132,7 @@ FileViewer::FileViewer(wxWindow*)
 
     m_openInEditor = new wxButton(panel, wxID_ANY, MSW_OR_OTHER(_("Open in editor"), _("Open in Editor")));
 #ifdef __WXOSX__
-    static_cast<NSButton*>(m_openInEditor->GetHandle()).bezelStyle = NSRoundRectBezelStyle;
+    static_cast<NSButton*>(m_openInEditor->GetHandle()).bezelStyle = NSBezelStyleRoundRect;
 #endif
     m_topBarSizer->Add(m_openInEditor, wxSizerFlags().Center().ReserveSpaceEvenIfHidden().Border(wxLEFT, PX(10)));
 

diff --git a/src/sidebar.cpp b/src/sidebar.cpp
@@ -426,18 +426,10 @@ class SuggestionWidget : public wxWindow
         {
 #ifdef __WXOSX__
             auto winbg = GetBackgroundColour();
-            wxColour highlight;
-            if (@available(macOS 10.14, *))
-            {
-                NSColor *bg = winbg.OSXGetNSColor();
-                NSColor *osHighlight = [bg colorWithSystemEffect:NSColorSystemEffectRollover];
-                // use only lighter version of the highlight by blending with the background
-                highlight = wxColour([bg blendedColorWithFraction:0.2 ofColor:osHighlight]);
-            }
-            else
-            {
-                highlight = winbg.ChangeLightness(95);
-            }
+            NSColor *bg = winbg.OSXGetNSColor();
+            NSColor *osHighlight = [bg colorWithSystemEffect:NSColorSystemEffectRollover];
+            // use only lighter version of the highlight by blending with the background
+            auto highlight = wxColour([bg blendedColorWithFraction:0.2 ofColor:osHighlight]);
 #else
             auto highlight = m_bgHighlight;
 #endif