comparison: ui/motif/container.c
ui/motif/container.c
- changeset 922
- 20dff5f878e1
- parent 920
- 10a783120051
equal
deleted
inserted
replaced
| 921:c2b318b93062 | 922:20dff5f878e1 |
|---|---|
| 247 | 247 |
| 248 UiContainerPrivate *ctn = ui_obj_container(obj); | 248 UiContainerPrivate *ctn = ui_obj_container(obj); |
| 249 UiLayout layout = UI_ARGS2LAYOUT(args); | 249 UiLayout layout = UI_ARGS2LAYOUT(args); |
| 250 | 250 |
| 251 Widget parent = ui_container_prepare(ctn, &layout, xargs, &n); | 251 Widget parent = ui_container_prepare(ctn, &layout, xargs, &n); |
| 252 if(args->width > 0) { | |
| 253 XtSetArg(xargs[n], XmNwidth, args->width); n++; | |
| 254 } | |
| 255 if(args->height > 0) { | |
| 256 XtSetArg(xargs[n], XmNheight, args->height); n++; | |
| 257 } | |
| 252 | 258 |
| 253 char *name = args->name ? (char*)args->name : "frame"; | 259 char *name = args->name ? (char*)args->name : "frame"; |
| 254 Widget frame = XmCreateFrame(parent, name, xargs, n); | 260 Widget frame = XmCreateFrame(parent, name, xargs, n); |
| 255 XtManageChild(frame); | 261 XtManageChild(frame); |
| 256 ui_container_add(ctn, frame); | 262 ui_container_add(ctn, frame); |
| 695 | 701 |
| 696 Arg xargs[16]; | 702 Arg xargs[16]; |
| 697 int n = 0; | 703 int n = 0; |
| 698 | 704 |
| 699 XtSetArg(xargs[n], XmNscrollingPolicy, XmAUTOMATIC); n++; | 705 XtSetArg(xargs[n], XmNscrollingPolicy, XmAUTOMATIC); n++; |
| 706 if(args->width > 0) { | |
| 707 XtSetArg(xargs[n], XmNwidth, args->width); n++; | |
| 708 } | |
| 709 if(args->height > 0) { | |
| 710 XtSetArg(xargs[n], XmNheight, args->height); n++; | |
| 711 } | |
| 700 | 712 |
| 701 Widget parent = ui_container_prepare(ctn, &layout, xargs, &n); | 713 Widget parent = ui_container_prepare(ctn, &layout, xargs, &n); |
| 702 Widget scrolledwindow = XmCreateScrolledWindow(parent, "scrolledwindow", xargs, n); | 714 Widget scrolledwindow = XmCreateScrolledWindow(parent, "scrolledwindow", xargs, n); |
| 703 ui_container_add(ctn, scrolledwindow); | 715 ui_container_add(ctn, scrolledwindow); |
| 704 | 716 |
