Mercurial > hg > idav / file diff

--- a/ui/motif/text.c	Sat Oct 04 14:54:25 2025 +0200
+++ b/ui/motif/text.c	Sun Oct 19 21:20:08 2025 +0200
@@ -45,13 +45,14 @@
     XtSetArg(xargs[n], XmNeditMode, XmMULTI_LINE_EDIT); n++;
     
     UiContainerPrivate *ctn = ui_obj_container(obj);
-    UI_APPLY_LAYOUT(ctn->layout, args);
+    UiLayout layout = UI_ARGS2LAYOUT(args);
     
-    Widget parent = ctn->prepare(ctn, xargs, &n);
+    Widget parent = ui_container_prepare(ctn, &layout, xargs, &n);
     char *name = args->name ? (char*)args->name : "textarea";
     XtSetArg(xargs[n], XmNwidth, 100); n++;
     Widget widget = XmCreateScrolledText(parent, name, xargs, n);
     XtManageChild(widget);
+    ui_container_add(ctn, widget);
     
     UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args->value, args->varname, UI_VAR_TEXT);
     
@@ -396,12 +397,13 @@
     }
     
     UiContainerPrivate *ctn = ui_obj_container(obj);
-    UI_APPLY_LAYOUT(ctn->layout, args);
+    UiLayout layout = UI_ARGS2LAYOUT(args);
     
-    Widget parent = ctn->prepare(ctn, xargs, &n);
+    Widget parent = ui_container_prepare(ctn, &layout, xargs, &n);
     char *name = args->name ? (char*)args->name : "textfield";
     Widget textfield = XmCreateTextField(parent, name, xargs, n);
     XtManageChild(textfield);
+    ui_container_add(ctn, textfield);
     
     ui_set_widget_groups(obj->ctx, textfield, args->groups);
     
@@ -971,9 +973,9 @@
     int n = 0;
     
     UiContainerPrivate *ctn = ui_obj_container(obj);
-    UI_APPLY_LAYOUT(ctn->layout, args);
+    UiLayout layout = UI_ARGS2LAYOUT(args);
     
-    Widget parent = ctn->prepare(ctn, xargs, &n);
+    Widget parent = ui_container_prepare(ctn, &layout, xargs, &n);
     // TODO: name
     
 
@@ -987,7 +989,7 @@
     
     
     XtManageChild(pathbar->widget);
-    ctn->add(ctn, pathbar->widget);
+    ui_container_add(ctn, pathbar->widget);
     
     UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args->value, args->varname, UI_VAR_STRING);
     if (var) {