# HG changeset patch # User Olaf Wintermann # Date 1761042440 -7200 # Node ID be3df094f8db7c3eba889b687768a55e8fab5a59 # Parent 83bb0dd7123fecb3502da3fad1309debb552e116 fix cocoa makefile diff -r 83bb0dd7123f -r be3df094f8db ui/cocoa/ListDataSource.m --- a/ui/cocoa/ListDataSource.m Mon Oct 20 21:16:53 2025 +0200 +++ b/ui/cocoa/ListDataSource.m Tue Oct 21 12:27:20 2025 +0200 @@ -98,6 +98,12 @@ case UI_ICON_TEXT_FREE: { break; } + case UI_STRING_EDITABLE: { + break; + } + case UI_BOOL_EDITABLE: { + break; + } } if(freeResult) { diff -r 83bb0dd7123f -r be3df094f8db ui/cocoa/label.m --- a/ui/cocoa/label.m Mon Oct 20 21:16:53 2025 +0200 +++ b/ui/cocoa/label.m Tue Oct 21 12:27:20 2025 +0200 @@ -27,7 +27,7 @@ */ #import "label.h" -#import "container.h" +#import "Container.h" #import diff -r 83bb0dd7123f -r be3df094f8db ui/cocoa/objs.mk --- a/ui/cocoa/objs.mk Mon Oct 20 21:16:53 2025 +0200 +++ b/ui/cocoa/objs.mk Tue Oct 21 12:27:20 2025 +0200 @@ -50,6 +50,7 @@ COCOAOBJ += widget.o COCOAOBJ += image.o COCOAOBJ += entry.o +COCOAOBJ += TabView.o TOOLKITOBJS += $(COCOAOBJ:%=$(COCOA_OBJPRE)%) TOOLKITSOURCE += $(COCOAOBJ:%.o=cocoa/%.m) diff -r 83bb0dd7123f -r be3df094f8db ui/cocoa/toolkit.h --- a/ui/cocoa/toolkit.h Mon Oct 20 21:16:53 2025 +0200 +++ b/ui/cocoa/toolkit.h Tue Oct 21 12:27:20 2025 +0200 @@ -31,10 +31,10 @@ #include "../common/context.h" #include "../common/object.h" -@interface UiAppCallback : NSObject { - ui_threadfunc callback; - void *userdata; -} +@interface UiAppCallback : NSObject + +@property ui_threadfunc callback; +@property void *userdata; - (id) initWithCallback:(ui_threadfunc)func userdata:(void*)userdata; diff -r 83bb0dd7123f -r be3df094f8db ui/cocoa/toolkit.m --- a/ui/cocoa/toolkit.m Mon Oct 20 21:16:53 2025 +0200 +++ b/ui/cocoa/toolkit.m Tue Oct 21 12:27:20 2025 +0200 @@ -178,8 +178,8 @@ @implementation UiAppCallback - (id) initWithCallback:(ui_threadfunc)func userdata:(void*)userdata { - self->callback = func; - self->userdata = userdata; + _callback = func; + _userdata = userdata; return self; } @@ -190,7 +190,9 @@ } - (void) mainThread:(id)n { - callback(userdata); + if(_callback) { + _callback(_userdata); + } } @end diff -r 83bb0dd7123f -r be3df094f8db ui/cocoa/widget.h --- a/ui/cocoa/widget.h Mon Oct 20 21:16:53 2025 +0200 +++ b/ui/cocoa/widget.h Tue Oct 21 12:27:20 2025 +0200 @@ -27,5 +27,5 @@ */ #import "toolkit.h" -#import "container.h" +#import "Container.h" #import "../ui/widget.h" diff -r 83bb0dd7123f -r be3df094f8db ui/cocoa/widget.m --- a/ui/cocoa/widget.m Mon Oct 20 21:16:53 2025 +0200 +++ b/ui/cocoa/widget.m Tue Oct 21 12:27:20 2025 +0200 @@ -45,6 +45,11 @@ } +UIWIDGET ui_separator_create(UiObject *obj, UiWidgetArgs *args) { + // TODO + return NULL; +} + /* custom widget */