Mercurial > dwindows
changeset 2100:12a9546c3e03
Mac: Fix returning the correct value on query after Windows changes.
Mac: Also fix some Xcode warnings regarding Mojave 10.14.
Win: Fix a minor typo in the last commit
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 12 Jun 2020 20:55:01 +0000 |
parents | 296a3872ddd9 |
children | 07666f97412f |
files | mac/dw.m win/dw.c |
diffstat | 2 files changed, 18 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mac/dw.m Fri Jun 12 20:40:47 2020 +0000 +++ b/mac/dw.m Fri Jun 12 20:55:01 2020 +0000 @@ -12629,16 +12629,19 @@ #ifdef BUILDING_FOR_MOJAVE case DW_FEATURE_DARK_MODE: { - NSAppearance *appearance = [DWApp appearance]; - - if(appearance) - { - NSAppearanceName basicAppearance = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; - - if([basicAppearance isEqualToString:NSAppearanceNameDarkAqua]) - return 2; - if([basicAppearance isEqualToString:NSAppearanceNameAqua]) - return DW_FEATURE_DISABLED; + if(@available(macOS 10.14, *)) + { + NSAppearance *appearance = [DWApp appearance]; + + if(appearance) + { + NSAppearanceName basicAppearance = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; + + if([basicAppearance isEqualToString:NSAppearanceNameDarkAqua]) + return 3; + if([basicAppearance isEqualToString:NSAppearanceNameAqua]) + return DW_FEATURE_DISABLED; + } } return DW_FEATURE_ENABLED; } @@ -12687,7 +12690,10 @@ [DWApp setAppearance:nil]; /* 2 forces dark mode aqua appearance */ else if(state == 3) - [DWApp setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]]; + { + if(@available(macOS 10.14, *)) + [DWApp setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]]; + } else return DW_ERROR_GENERAL; return DW_ERROR_NONE;