Mercurial > dwindows
changeset 2148:79e9c8080ad9
Mac: Beta 2 of Xcode 12 has 10_16 defined but max allowed is 10_15.
The new warnings are about deprecations in 10.15 so switching them to
Catalina instead of Big Sur. Still not sure why it isn't 11.0 SDK.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Fri, 24 Jul 2020 19:27:31 +0000 |
| parents | dfc64135adb6 |
| children | c08e03168a9e |
| files | mac/dw.m |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mac/dw.m Sat Jul 18 19:34:04 2020 +0000 +++ b/mac/dw.m Fri Jul 24 19:27:31 2020 +0000 @@ -163,7 +163,7 @@ #endif /* Handle deprecation of constants in 10.16... */ -#if defined(MAC_OS_X_VERSION_11_0) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_11_0) || !defined(MAC_OS_X_VERSION_MAX_ALLOWED)) +#if defined(MAC_OS_X_VERSION_10_16) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16) || !defined(MAC_OS_X_VERSION_MAX_ALLOWED)) #define BUILDING_FOR_BIG_SUR #endif @@ -4446,7 +4446,7 @@ DWBox *thisbox = dw_box_new(type, pad); Box *box = [thisbox box]; -#ifndef BUILDING_FOR_BIG_SUR +#ifndef BUILDING_FOR_CATALINA [groupbox setBorderType:NSBezelBorder]; #endif [groupbox setTitle:[NSString stringWithUTF8String:title]]; @@ -6394,7 +6394,7 @@ NSBox *border = [[NSBox alloc] init]; NSTextField *textfield = dw_text_new(text, cid); -#ifndef BUILDING_FOR_BIG_SUR +#ifndef BUILDING_FOR_CATALINA [border setBorderType:NSGrooveBorder]; #endif [border setTitlePosition:NSNoTitle];