Merge branch 'master' into windows-namespace-and-hresult-cleanup

This commit is contained in:
Pietro Gagliardi 2018-05-31 08:21:40 -04:00
commit c4ce1072c7
2 changed files with 15 additions and 3 deletions

View File

@ -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.

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)
{