--- a/ui/win32/container.c Wed Jul 15 20:03:33 2026 +0200 +++ b/ui/win32/container.c Tue Jul 21 16:46:44 2026 +0200 @@ -99,14 +99,14 @@ return box_create(obj, args, UI_BOX_HORIZONTAL); } -UiContainerX* ui_box_container_create(UiObject *obj, HWND hwnd, UiBoxOrientation orientation, short spacing, GridEdgeInsets padding) { +UiContainer* ui_box_container_create(UiObject *obj, HWND hwnd, UiBoxOrientation orientation, short spacing, GridEdgeInsets padding) { UiBoxContainer *container = cxZalloc(obj->ctx->allocator, sizeof(UiBoxContainer)); container->container.hwnd = hwnd; container->container.add = ui_box_container_add; container->layout = ui_grid_layout_create(obj->ctx->allocator, spacing, spacing); container->layout->padding = padding; container->orientation = orientation; - return (UiContainerX*)container; + return (UiContainer*)container; } void ui_box_container_add(UiContainerPrivate *ctn, W32Widget *widget, UiLayout *layout) { @@ -156,7 +156,7 @@ UiGridWidget *widget = w32_widget_create(&grid_layout_widget_class, hwnd, sizeof(UiGridWidget)); ui_container_add(container, (W32Widget*)widget, &layout); - UiContainerX *gridContainer = ui_grid_container_create(obj, hwnd, args->columnspacing, args->rowspacing, INSETS_ZERO); + UiContainer *gridContainer = ui_grid_container_create(obj, hwnd, args->columnspacing, args->rowspacing, INSETS_ZERO); uic_object_push_container(obj, gridContainer); UiGridLayoutContainer *grid = (UiGridLayoutContainer*)gridContainer; @@ -169,13 +169,13 @@ return (W32Widget*)widget; } -UiContainerX* ui_grid_container_create(UiObject *obj, HWND hwnd, short columnspacing, short rowspacing, GridEdgeInsets padding) { +UiContainer* ui_grid_container_create(UiObject *obj, HWND hwnd, short columnspacing, short rowspacing, GridEdgeInsets padding) { UiGridLayoutContainer *container = cxZalloc(obj->ctx->allocator, sizeof(UiGridLayoutContainer)); container->container.hwnd = hwnd; container->container.add = ui_grid_container_add; container->layout = ui_grid_layout_create(obj->ctx->allocator, columnspacing, rowspacing); container->layout->padding = padding; - return (UiContainerX*)container; + return (UiContainer*)container; } void ui_grid_container_add(UiContainerPrivate *ctn, W32Widget *widget, UiLayout *layout) { @@ -204,12 +204,12 @@ /* ---------------------------- Container Helper ---------------------------- */ 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;