Mercurial > hg > idav / file diff

--- a/ui/motif/label.c	Sat Oct 04 14:54:25 2025 +0200
+++ b/ui/motif/label.c	Sun Oct 19 21:20:08 2025 +0200
@@ -41,9 +41,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);
     
     XtSetArg(xargs[n], XmNalignment, align); n++;
     XmString label = NULL;
@@ -55,7 +55,7 @@
     char *name = args->name ? (char*)args->name : "label";
     Widget w = XmCreateLabel(parent, name, xargs, n);
     XtManageChild(w);
-    ctn->add(ctn, w);
+    ui_container_add(ctn, w);
       
     XmStringFree(label);
     return w;
@@ -108,12 +108,13 @@
     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);
     
     char *name = args->name ? (char*)args->name : "progressbar";
     Widget frame = XmCreateFrame(parent, name, xargs, n);
+    ui_container_add(ctn, frame);
     
     // create a button and get some informations about the height, shadow, highlight, ....
     // we want the frame to have the same dimensions as a normal button
@@ -191,9 +192,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);
      
     XmString label = XmStringCreateSimple("");
     XtSetArg(xargs[n], XmNlabelString, label); n++;
@@ -203,7 +204,7 @@
     char *name = args->name ? (char*)args->name : "progresss_spinner";
     Widget w = XmCreateLabel(parent, name, xargs, n);
     XtManageChild(w);
-    ctn->add(ctn, w);
+    ui_container_add(ctn, w);
     
     UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args->value, args->varname, UI_VAR_INTEGER);
     if(var) {