# HG changeset patch # User Olaf Wintermann # Date 1778666263 -7200 # Node ID bd1fe6134c1a3b412626dc8ec673cadf7aa9f475 # Parent 428ee5baec0ef12b0131f617aa7c531f4ef3da76 fix cocoa build diff -r 428ee5baec0e -r bd1fe6134c1a ui/cocoa/GridLayout.h --- a/ui/cocoa/GridLayout.h Sun May 10 11:20:04 2026 +0200 +++ b/ui/cocoa/GridLayout.h Wed May 13 11:57:43 2026 +0200 @@ -56,7 +56,7 @@ @interface GridLayout : NSView -@property UiContainerX *container; +@property UiContainer *container; @property int columnspacing; @property int rowspacing; diff -r 428ee5baec0e -r bd1fe6134c1a ui/cocoa/MainWindow.m --- a/ui/cocoa/MainWindow.m Sun May 10 11:20:04 2026 +0200 +++ b/ui/cocoa/MainWindow.m Wed May 13 11:57:43 2026 +0200 @@ -126,7 +126,7 @@ [vbox.trailingAnchor constraintEqualToAnchor:content.trailingAnchor], [vbox.bottomAnchor constraintEqualToAnchor:content.bottomAnchor], ]]; - UiContainerX *container = ui_create_container(obj, vbox); + UiContainer *container = ui_create_container(obj, vbox); vbox.container = container; uic_object_push_container(obj, container); } diff -r 428ee5baec0e -r bd1fe6134c1a ui/cocoa/TabView.m --- a/ui/cocoa/TabView.m Sun May 10 11:20:04 2026 +0200 +++ b/ui/cocoa/TabView.m Wed May 13 11:57:43 2026 +0200 @@ -113,7 +113,7 @@ UiObject *newobj = uic_object_new_toplevel(); newobj->widget = (__bridge void*)sub; - UiContainerX *container = ui_create_container(newobj, sub); + UiContainer *container = ui_create_container(newobj, sub); uic_object_push_container(newobj, container); return newobj; diff -r 428ee5baec0e -r bd1fe6134c1a ui/cocoa/container.h --- a/ui/cocoa/container.h Sun May 10 11:20:04 2026 +0200 +++ b/ui/cocoa/container.h Wed May 13 11:57:43 2026 +0200 @@ -51,7 +51,7 @@ @protocol Container -@property UiContainerX *container; +@property UiContainer *container; - (void) addView:(NSView*)view layout:(UiLayout*)layout; @@ -73,6 +73,6 @@ @end -UiContainerX* ui_create_container(UiObject *obj, id container); +UiContainer* ui_create_container(UiObject *obj, id container); void ui_container_add(UiObject *obj, NSView *view, UiLayout *layout); diff -r 428ee5baec0e -r bd1fe6134c1a ui/cocoa/container.m --- a/ui/cocoa/container.m Sun May 10 11:20:04 2026 +0200 +++ b/ui/cocoa/container.m Wed May 13 11:57:43 2026 +0200 @@ -36,7 +36,7 @@ static UIWIDGET ui_box_create(UiObject *obj, UiContainerArgs *args, NSUserInterfaceLayoutOrientation orientation) { BoxContainer *box = [[BoxContainer alloc] init:orientation spacing:args->spacing]; box.translatesAutoresizingMaskIntoConstraints = false; - UiContainerX *container = ui_create_container(obj, box); + UiContainer *container = ui_create_container(obj, box); // add box to the parent UiLayout layout = UI_INIT_LAYOUT(args); @@ -61,7 +61,7 @@ grid.translatesAutoresizingMaskIntoConstraints = false; grid.columnspacing = args->columnspacing; grid.rowspacing = args->rowspacing; - UiContainerX *container = ui_create_container(obj, grid); + UiContainer *container = ui_create_container(obj, grid); grid.container = container; // add box to the parent @@ -81,7 +81,7 @@ ui_container_add(obj, frame, &layout); // add container to the chain - UiContainerX *container; + UiContainer *container; UiLayout subLayout = {0}; switch(args->subcontainer) { default: { @@ -137,7 +137,7 @@ UiLayout layout = UI_ARGS2LAYOUT(args); ui_container_add(obj, scrollview, &layout); - UiContainerX *container = ui_create_container(obj, scrollview); + UiContainer *container = ui_create_container(obj, scrollview); uic_object_push_container(obj, container); return (__bridge void*)scrollview; @@ -152,19 +152,19 @@ UiLayout layout = UI_ARGS2LAYOUT(args); ui_container_add(obj, tabview, &layout); - UiContainerX *container = ui_create_container(obj, tabview); + UiContainer *container = ui_create_container(obj, tabview); uic_object_push_container(obj, container); return (__bridge void*)tabview; } void ui_tab_create(UiObject *obj, const char* title) { - UiContainerX *ctn = obj->container_end; + UiContainer *ctn = obj->container_end; id tabview = (__bridge id)ctn->container; NSString *s = title ? [[NSString alloc]initWithUTF8String:title] : @""; NSView *sub = [tabview createTab:-1 title:s]; - UiContainerX *container = ui_create_container(obj, sub); + UiContainer *container = ui_create_container(obj, sub); uic_object_push_container(obj, container); } @@ -204,12 +204,12 @@ void ui_container_begin_close(UiObject *obj) { - UiContainerX *ct = obj->container_end; + UiContainer *ct = obj->container_end; ct->close = 1; } int ui_container_finish(UiObject *obj) { - UiContainerX *ct = obj->container_end; + UiContainer *ct = obj->container_end; if(ct->close) { ui_end_new(obj); return 0; @@ -307,8 +307,8 @@ /* ------------------------- private functions ------------------------- */ -UiContainerX* ui_create_container(UiObject *obj, id container) { - UiContainerX *ctn = ui_malloc(obj->ctx, sizeof(UiContainerX)); +UiContainer* ui_create_container(UiObject *obj, id container) { + UiContainer *ctn = ui_malloc(obj->ctx, sizeof(UiContainer)); ctn->container = (__bridge void*)container; ctn->close = 0; ctn->prev = NULL; @@ -318,7 +318,7 @@ } void ui_container_add(UiObject *obj, NSView *view, UiLayout *layout) { - UiContainerX *ctn = obj->container_end; + UiContainer *ctn = obj->container_end; id container = (__bridge id)ctn->container; UiLayout adjustedLayout = *layout; if(adjustedLayout.margin > 0) { diff -r 428ee5baec0e -r bd1fe6134c1a ui/cocoa/window.m --- a/ui/cocoa/window.m Sun May 10 11:20:04 2026 +0200 +++ b/ui/cocoa/window.m Wed May 13 11:57:43 2026 +0200 @@ -452,7 +452,7 @@ [vbox.bottomAnchor constraintEqualToAnchor:buttonArea.topAnchor constant:0] ]]; - UiContainerX *container = ui_create_container(obj, vbox); + UiContainer *container = ui_create_container(obj, vbox); vbox.container = container; uic_object_push_container(obj, container);