Mercurial > hg > idav / file diff

--- a/ui/motif/button.c	Sat Oct 04 14:54:25 2025 +0200
+++ b/ui/motif/button.c	Sun Oct 19 21:20:08 2025 +0200
@@ -46,9 +46,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 = NULL;
     if(args->label) {
@@ -59,7 +59,7 @@
     char *name = args->name ? (char*)args->name : "button";
     Widget button = XmCreatePushButton(parent, name, xargs, n);
     XtManageChild(button);
-    ctn->add(ctn, button);
+    ui_container_add(ctn, button);
     
     ui_set_widget_groups(obj->ctx, button, args->groups);
     
@@ -101,9 +101,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], XmNfillOnSelect, True); n++;
     XtSetArg(xargs[n], XmNindicatorOn, False); n++;
     
@@ -116,7 +116,7 @@
     char *name = args->name ? (char*)args->name : "togglebutton";
     Widget button = XmCreateToggleButton(parent, name, xargs, n);
     XtManageChild(button);
-    ctn->add(ctn, button);
+    ui_container_add(ctn, button);
     
     ui_set_widget_groups(obj->ctx, button, args->groups);
     
@@ -131,9 +131,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 = NULL;
     if(args->label) {
@@ -144,7 +144,7 @@
     char *name = args->name ? (char*)args->name : "button";
     Widget button = XmCreateToggleButton(parent, name, xargs, n);
     XtManageChild(button);
-    ctn->add(ctn, button);
+    ui_container_add(ctn, button);
     
     ui_set_widget_groups(obj->ctx, button, args->groups);
     
@@ -350,9 +350,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], XmNindicatorType, XmONE_OF_MANY_ROUND); n++;
     XmString label = NULL;
     if(args->label) {
@@ -363,7 +363,7 @@
     char *name = args->name ? (char*)args->name : "button";
     Widget button = XmCreateToggleButton(parent, name, xargs, n);
     XtManageChild(button);
-    ctn->add(ctn, button);
+    ui_container_add(ctn, button);
     
     ui_set_widget_groups(obj->ctx, button, args->groups);