From 2f0e6e974b0935cb426f397bf271e365abf55ca5 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Wed, 30 May 2018 08:52:24 -0400 Subject: [PATCH 1/2] And updated the README. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ae6a9691..e9bbd4e5 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,9 @@ But libui is not dead; I am working on it whenever I can, and I hope to get it t *Note that today's entry (Eastern Time) may be updated later today.* +* **30 May 2018** + * Merged the previous Announcements and Updates section of this README into a single News section, and merged the respective archive files into a single NEWS.md file. + * **16 May 2018** * Thanks to @parro-it and @msink, libui now has better CI, including AppVeyor for Windows CI, and automated creation of binary releases when I make a tagged release. From 1b4c898a0c84368bfb6709b38dc218f254b0ca0c Mon Sep 17 00:00:00 2001 From: Niklas Mischkulnig Date: Thu, 31 May 2018 13:01:29 +0200 Subject: [PATCH 2/2] Fix datetimepicker crash --- darwin/datetimepicker.m | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/darwin/datetimepicker.m b/darwin/datetimepicker.m index ed164855..b786dea9 100644 --- a/darwin/datetimepicker.m +++ b/darwin/datetimepicker.m @@ -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) {