From 86924b8399715b6bc4e72c05dfd9c1f6103beb45 Mon Sep 17 00:00:00 2001 From: Olaf Wintermann Date: Wed, 13 May 2026 12:02:59 +0200 Subject: [PATCH] update toolkit, fixes macos build --- resource/.DS_Store | Bin 6148 -> 6148 bytes ui/cocoa/GridLayout.h | 2 +- ui/cocoa/MainWindow.m | 2 +- ui/cocoa/TabView.m | 2 +- ui/cocoa/container.h | 4 ++-- ui/cocoa/container.m | 24 ++++++++++++------------ ui/cocoa/window.m | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/resource/.DS_Store b/resource/.DS_Store index 2bdfb3010ce8dc6c77e262a4d30de4fdec5c2fb7..55753e79fee03f86088f08a787a442b260928ebe 100644 GIT binary patch delta 155 zcmZoMXfc=|#>B!ku~2NHo+2aX#(>?7i!U%UF>-F^VVcD#kdtm0oSdIqzyJo4>n3+G z%ZTLWySOCfnaQAOqQ$fX$uE#~3%WbMSKjt=@c)`8)Gu Uei26wMg|5ZkUg6tMAk3^0J-%mc>n+a delta 68 zcmZoMXfc=|#>B)qu~2NHo+2ab#(>?7jI5h^SY|P9j$>QNxUpde(`I%Keh#3T&4L`? WnJ4p$IC3xm0V4wg%jO7?HOv5QD-dM> diff --git a/ui/cocoa/GridLayout.h b/ui/cocoa/GridLayout.h index c7f7519..ccb6528 100644 --- a/ui/cocoa/GridLayout.h +++ b/ui/cocoa/GridLayout.h @@ -56,7 +56,7 @@ typedef struct GridDef { @interface GridLayout : NSView -@property UiContainerX *container; +@property UiContainer *container; @property int columnspacing; @property int rowspacing; diff --git a/ui/cocoa/MainWindow.m b/ui/cocoa/MainWindow.m index 3806f6c..d46025f 100644 --- a/ui/cocoa/MainWindow.m +++ b/ui/cocoa/MainWindow.m @@ -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 --git a/ui/cocoa/TabView.m b/ui/cocoa/TabView.m index 5b50048..5cfc1bf 100644 --- a/ui/cocoa/TabView.m +++ b/ui/cocoa/TabView.m @@ -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 --git a/ui/cocoa/container.h b/ui/cocoa/container.h index ed2dc67..89512ac 100644 --- a/ui/cocoa/container.h +++ b/ui/cocoa/container.h @@ -51,7 +51,7 @@ typedef struct UiLayout UiLayout; @protocol Container -@property UiContainerX *container; +@property UiContainer *container; - (void) addView:(NSView*)view layout:(UiLayout*)layout; @@ -73,6 +73,6 @@ typedef struct UiLayout UiLayout; @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 --git a/ui/cocoa/container.m b/ui/cocoa/container.m index 9081da8..b1a5a1c 100644 --- a/ui/cocoa/container.m +++ b/ui/cocoa/container.m @@ -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 @@ UIWIDGET ui_grid_create(UiObject *obj, UiContainerArgs *args) { 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 @@ UIWIDGET ui_frame_create(UiObject *obj, UiFrameArgs *args) { 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 @@ UIWIDGET ui_scrolledwindow_create(UiObject *obj, UiFrameArgs *args) { 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 @@ UIWIDGET ui_tabview_create(UiObject *obj, UiTabViewArgs *args) { 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 @@ UIWIDGET ui_vsplitpane_create(UiObject *obj, UiSplitPaneArgs *args) { 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 @@ int ui_container_finish(UiObject *obj) { /* ------------------------- 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 @@ UiContainerX* ui_create_container(UiObject *obj, id container) { } 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 --git a/ui/cocoa/window.m b/ui/cocoa/window.m index 0946387..b0259d2 100644 --- a/ui/cocoa/window.m +++ b/ui/cocoa/window.m @@ -452,7 +452,7 @@ UiObject *ui_dialog_window_create(UiObject *parent, UiDialogWindowArgs *args) { [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); -- 2.47.3