Merge pull request #376 from mischnic/datetime-unreg

Fix uiDateTimePicker-related crashes in test on OS X: they were not being destroyed properly.
This commit is contained in:
Pietro Gagliardi 2018-05-31 08:20:16 -04:00 committed by GitHub
commit cda991b7e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions

View File

@ -16,8 +16,8 @@ struct uiDateTimePicker {
}
- (void)datePickerCell:(NSDatePickerCell *)aDatePickerCell validateProposedDateValue:(NSDate **)proposedDateValue timeInterval:(NSTimeInterval *)proposedTimeInterval;
- (void)doTimer:(NSTimer *)timer;
- (void)registerPicker:(uiDateTimePicker *)b;
- (void)unregisterPicker:(uiDateTimePicker *)b;
- (void)registerPicker:(uiDateTimePicker *)d;
- (void)unregisterPicker:(uiDateTimePicker *)d;
@end
@implementation uiprivDatePickerDelegateClass
@ -78,7 +78,16 @@ struct uiDateTimePicker {
static uiprivDatePickerDelegateClass *datePickerDelegate = nil;
uiDarwinControlAllDefaults(uiDateTimePicker, dp)
uiDarwinControlAllDefaultsExceptDestroy(uiDateTimePicker, dp)
static void uiDateTimePickerDestroy(uiControl *c)
{
uiDateTimePicker *d = uiDateTimePicker(c);
[datePickerDelegate unregisterPicker:d];
[d->dp release];
uiFreeControl(uiControl(d));
}
static void defaultOnChanged(uiDateTimePicker *d, void *data)
{