Mercurial > dwindows

changeset 2352:360f3cb6bd57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mac: Revert the HAVE_AVAILABLE portion of that last commit... @available() only seems to work when running on older versions of MacOS. It does not work for building on older versions.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 05 Mar 2021 06:03:55 +0000
parents 0c8d769df97e
children 29cc92d4218b
files mac/dw.m
diffstat 1 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Fri Mar 05 04:30:20 2021 +0000
+++ b/mac/dw.m	Fri Mar 05 06:03:55 2021 +0000
@@ -101,7 +101,6 @@
 #define DWEventMaskRightMouseDown NSEventMaskRightMouseDown
 #define DWWindowStyleMaskResizable NSWindowStyleMaskResizable
 #define BUILDING_FOR_SIERRA
-#define HAVE_AVAILABLE
 #else
 #define DWButtonTypeSwitch NSSwitchButton
 #define DWButtonTypeRadio NSRadioButton
@@ -437,7 +436,7 @@
 /* Returns TRUE of Mojave or later is in Dark Mode */
 BOOL _is_dark(id object)
 {
-#ifdef HAVE_AVAILABLE
+#ifdef BUILDING_FOR_MOJAVE
     NSAppearance *appearance = [object effectiveAppearance];
 
     if(@available(macOS 10.14, *))
@@ -1466,7 +1465,7 @@
 #if defined(BUILDING_FOR_MOUNTAIN_LION) && !defined(BUILDING_FOR_BIG_SUR)
 -(void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-#ifdef HAVE_AVAILABLE
+#ifdef BUILDING_FOR_MOJAVE
     if (@available(macOS 10.14, *)) {} else
 #endif
     {
@@ -11148,7 +11147,7 @@
         va_end(args);
     }
 
-#ifdef HAVE_AVAILABLE
+#ifdef BUILDING_FOR_MOJAVE
     /* Configure the notification's payload. */
     if (@available(macOS 10.14, *))
     {
@@ -11213,7 +11212,7 @@
     {
         NSString *notid = [NSString stringWithFormat:@"dw-notification-%llu", DW_POINTER_TO_ULONGLONG(notification)];
         
-#ifdef HAVE_AVAILABLE
+#ifdef BUILDING_FOR_MOJAVE
         /* Schedule the notification. */
         if (@available(macOS 10.14, *))
         {
@@ -12528,7 +12527,7 @@
     DWObj = [[DWObject alloc] init];
     DWDefaultFont = nil;
     DWFontManager = [NSFontManager sharedFontManager];
-#ifdef HAVE_AVAILABLE
+#ifdef BUILDING_FOR_MOJAVE
     if (@available(macOS 10.14, *))
     {
         if([[NSBundle mainBundle] bundleIdentifier] != nil)
@@ -12757,7 +12756,7 @@
 
         if(params && params[0] && params[1])
         {
-#ifdef HAVE_AVAILABLE
+#ifdef BUILDING_FOR_CATALINA
             if(@available(macOS 10.15, *))
             {
                 NSURL *url = _dw_url_from_program(nsprogram, ws);
@@ -12810,7 +12809,7 @@
         }
         else
         {
-#ifdef HAVE_AVAILABLE
+#ifdef BUILDING_FOR_CATALINA
             if(@available(macOS 10.15, *))
             {
                 NSURL *url = _dw_url_from_program(nsprogram, ws);
@@ -13148,7 +13147,7 @@
         case DW_FEATURE_MLE_WORD_WRAP:
         case DW_FEATURE_UTF8_UNICODE:
             return DW_FEATURE_ENABLED;
-#ifdef HAVE_AVAILABLE
+#ifdef BUILDING_FOR_MOJAVE
         case DW_FEATURE_DARK_MODE:
         {
             if(@available(macOS 10.14, *))
@@ -13211,7 +13210,7 @@
         case DW_FEATURE_UTF8_UNICODE:
             return DW_ERROR_GENERAL;
         /* These features are supported and configurable */
-#ifdef HAVE_AVAILABLE
+#ifdef BUILDING_FOR_MOJAVE
         case DW_FEATURE_DARK_MODE:
         {
             if(@available(macOS 10.14, *))