Mercurial > dwindows
changeset 2004:ebbdb2120659
Mac: Fix building on 10.9 and earlier due to changed constant names.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Tue, 05 Nov 2019 21:06:23 +0000 |
| parents | dee122916f3c |
| children | a17cc1958369 |
| files | mac/dw.m |
| diffstat | 1 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mac/dw.m Tue Nov 05 11:58:07 2019 +0000 +++ b/mac/dw.m Tue Nov 05 21:06:23 2019 +0000 @@ -45,11 +45,19 @@ #define DWModalResponseOK NSModalResponseOK #define DWModalResponseCancel NSModalResponseCancel #define DWPaperOrientationPortrait NSPaperOrientationPortrait +#define DWCalendarUnitDay NSCalendarUnitDay +#define DWCalendarUnitMonth NSCalendarUnitMonth +#define DWCalendarUnitYear NSCalendarUnitYear +#define DWCalendarIdentifierGregorian NSCalendarIdentifierGregorian #define BUILDING_FOR_YOSEMITE #else #define DWModalResponseOK NSOKButton #define DWModalResponseCancel NSCancelButton #define DWPaperOrientationPortrait NSPortraitOrientation +#define DWCalendarUnitDay NSDayCalendarUnit +#define DWCalendarUnitMonth NSMonthCalendarUnit +#define DWCalendarUnitYear NSYearCalendarUnit +#define DWCalendarIdentifierGregorian (NSString *)kCFGregorianCalendar #endif /* Handle deprecation of several constants in 10.12... @@ -8632,9 +8640,9 @@ { DWCalendar *calendar = handle; DW_LOCAL_POOL_IN; - NSCalendar *mycalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; + NSCalendar *mycalendar = [[NSCalendar alloc] initWithCalendarIdentifier:DWCalendarIdentifierGregorian]; NSDate *date = [calendar dateValue]; - NSDateComponents* components = [mycalendar components:NSCalendarUnitDay|NSCalendarUnitMonth|NSCalendarUnitYear fromDate:date]; + NSDateComponents* components = [mycalendar components:DWCalendarUnitDay|DWCalendarUnitMonth|DWCalendarUnitYear fromDate:date]; *day = [components day]; *month = [components month]; *year = [components year];