uiDateTimePicker Use more 'uipriv' on OS X

This commit is contained in:
cody271 2018-05-12 21:40:47 -07:00
parent 9aba97714d
commit fd3b693ffe
1 changed files with 7 additions and 7 deletions

View File

@ -9,7 +9,7 @@ struct uiDateTimePicker {
}; };
@interface uiprivDatePickerDelegateClass : NSObject <NSDatePickerCellDelegate> { @interface uiprivDatePickerDelegateClass : NSObject <NSDatePickerCellDelegate> {
struct mapTable *pickers; struct uiprivMap *pickers;
} }
- (void)datePickerCell:(NSDatePickerCell *)aDatePickerCell validateProposedDateValue:(NSDate **)proposedDateValue timeInterval:(NSTimeInterval *)proposedTimeInterval; - (void)datePickerCell:(NSDatePickerCell *)aDatePickerCell validateProposedDateValue:(NSDate **)proposedDateValue timeInterval:(NSTimeInterval *)proposedTimeInterval;
- (void)doTimer:(NSTimer *)timer; - (void)doTimer:(NSTimer *)timer;
@ -23,13 +23,13 @@ struct uiDateTimePicker {
{ {
self = [super init]; self = [super init];
if (self) if (self)
self->pickers = newMap(); self->pickers = uiprivNewMap();
return self; return self;
} }
- (void)dealloc - (void)dealloc
{ {
mapDestroy(self->pickers); uiprivMapDestroy(self->pickers);
[super dealloc]; [super dealloc];
} }
@ -39,7 +39,7 @@ struct uiDateTimePicker {
{ {
uiDateTimePicker *d; uiDateTimePicker *d;
d = (uiDateTimePicker *) mapGet(self->pickers, aDatePickerCell); d = (uiDateTimePicker *) uiprivMapGet(self->pickers, aDatePickerCell);
[NSTimer scheduledTimerWithTimeInterval:0 [NSTimer scheduledTimerWithTimeInterval:0
target:self target:self
selector:@selector(doTimer:) selector:@selector(doTimer:)
@ -57,14 +57,14 @@ struct uiDateTimePicker {
- (void)registerPicker:(uiDateTimePicker *)d - (void)registerPicker:(uiDateTimePicker *)d
{ {
mapSet(self->pickers, d->dp.cell, d); uiprivMapSet(self->pickers, d->dp.cell, d);
[d->dp setDelegate:self]; [d->dp setDelegate:self];
} }
- (void)unregisterPicker:(uiDateTimePicker *)d - (void)unregisterPicker:(uiDateTimePicker *)d
{ {
[d->dp setDelegate:nil]; [d->dp setDelegate:nil];
mapDelete(self->pickers, d->dp.cell); uiprivMapDelete(self->pickers, d->dp.cell);
} }
@end @end
@ -129,7 +129,7 @@ static uiDateTimePicker *finishNewDateTimePicker(NSDatePickerElementFlags elemen
if (datePickerDelegate == nil) { if (datePickerDelegate == nil) {
datePickerDelegate = [[uiprivDatePickerDelegateClass new] autorelease]; datePickerDelegate = [[uiprivDatePickerDelegateClass new] autorelease];
[delegates addObject:datePickerDelegate]; [uiprivDelegates addObject:datePickerDelegate];
} }
[datePickerDelegate registerPicker:d]; [datePickerDelegate registerPicker:d];
uiDateTimePickerOnChanged(d, defaultOnChanged, NULL); uiDateTimePickerOnChanged(d, defaultOnChanged, NULL);