toolkit: comparison ui/motif/container.c

-:fd0f943ff5f3
+:42ef3156ea09
 Widget parent = ui_container_prepare(ctn, &layout, xargs, &n);
 Widget grid = XtCreateManagedWidget(args->name ? args->name : "boxcontainer", gridClass, parent, xargs, n);
 ctn->add(ctn, grid);
-UiContainerX *container = ui_box_container(obj, grid, orientation);
+UiContainer *container = ui_box_container(obj, grid, orientation);
 uic_object_push_container(obj, container);
 uic_widget_set_visibility_states(obj->ctx, grid, args->visibility_states);
 return grid;
 // public
 UIWIDGET ui_hbox_create(UiObject *obj, UiContainerArgs *args) {
 return box_create(obj, args, UI_BOX_HORIZONTAL);
 }
-UiContainerX* ui_box_container(UiObject *obj, Widget grid, UiBoxOrientation orientation) {
+UiContainer* ui_box_container(UiObject *obj, Widget grid, UiBoxOrientation orientation) {
 UiBoxContainer *ctn = ui_malloc(obj->ctx, sizeof(UiBoxContainer));
 memset(ctn, 0, sizeof(UiBoxContainer));
 ctn->container.prepare = orientation == UI_BOX_VERTICAL ? ui_vbox_prepare : ui_hbox_prepare;
 ctn->container.add = ui_box_container_add;
 ctn->container.widget = grid;
 ctn->n = 0;
-return (UiContainerX*)ctn;
+return (UiContainer*)ctn;
 }
 static Widget ui_box_container_prepare(UiBoxContainer *box, UiLayout *layout, Arg *args, int *n) {
 ui_container_apply_grid_margin(args, n, layout->margin_left, layout->margin_right, layout->margin_top, layout->margin_bottom);
 box->n++;
 XtSetArg(xargs[n], gridColumnSpacing, args->columnspacing); n++;
 XtSetArg(xargs[n], gridRowSpacing, args->rowspacing); n++;
 Widget grid = XtCreateManagedWidget(args->name ? args->name : "gridcontainer", gridClass, parent, xargs, n);
 ui_container_add(ctn, grid);
-UiContainerX *container = ui_grid_container(obj, grid, args->def_hexpand, args->def_vexpand, args->def_hfill, args->def_vfill);
+UiContainer *container = ui_grid_container(obj, grid, args->def_hexpand, args->def_vexpand, args->def_hfill, args->def_vfill);
 uic_object_push_container(obj, container);
 uic_widget_set_visibility_states(obj->ctx, grid, args->visibility_states);
 return grid;
 }
-UiContainerX* ui_grid_container(
+UiContainer* ui_grid_container(
 UiObject *obj,
 Widget grid,
 UiBool def_hexpand,
 UiBool def_vexpand,
 UiBool def_hfill,
 ctn->y = 0;
 ctn->def_hexpand = def_hexpand;
 ctn->def_vexpand = def_vexpand;
 ctn->def_hfill = def_hfill;
 ctn->def_vfill = def_vfill;
-return (UiContainerX*)ctn;
+return (UiContainer*)ctn;
 }
 Widget ui_grid_container_prepare(UiContainerPrivate *ctn, UiLayout *layout, Arg *args, int *n) {
 UiGridContainer *grid = (UiGridContainer*)ctn;
 if(ctn->container.newline) {
 Widget label = XmCreateLabel(frame, "frame_label", xargs, n);
 XtManageChild(label);
 XmStringFree(s);
 }
-UiContainerX *container = ui_frame_container(obj, frame);
+UiContainer *container = ui_frame_container(obj, frame);
 uic_object_push_container(obj, container);
 UiContainerArgs sub_args = {
 .spacing = args->spacing,
 .columnspacing = args->columnspacing,
 uic_widget_set_visibility_states(obj->ctx, frame, args->visibility_states);
 return frame;
 }
-UiContainerX* ui_frame_container(UiObject *obj, Widget frame) {
+UiContainer* ui_frame_container(UiObject *obj, Widget frame) {
 UiContainerPrivate *ctn = ui_malloc(obj->ctx, sizeof(UiContainerPrivate));
 memset(ctn, 0, sizeof(UiContainerPrivate));
 ctn->prepare = ui_frame_container_prepare;
 ctn->add = ui_frame_container_add;
 ctn->widget = frame;
-return (UiContainerX*)ctn;
+return (UiContainer*)ctn;
 }
 Widget ui_frame_container_prepare(UiContainerPrivate *ctn, UiLayout *layout, Arg *args, int *n) {
 int a = *n;
 XtSetArg(args[a], XmNchildType, XmFRAME_WORKAREA_CHILD);
 i->obj = tabview;
 i->get = ui_tabview_get;
 i->set = ui_tabview_set;
 }
-uic_object_push_container(obj, (UiContainerX*)ct);
+uic_object_push_container(obj, (UiContainer*)ct);
 uic_widget_set_visibility_states(obj->ctx, form, args->visibility_states);
 return form;
 }
 Widget grid = XtCreateManagedWidget("vbox", gridClass, tabviewdata->content, args, n);
 UiObject *newobj = ui_calloc(tabviewdata->obj->ctx, 1, sizeof(UiObject));
 newobj->ctx = tabviewdata->obj->ctx;
 newobj->widget = grid;
-UiContainerX *container = ui_box_container(newobj, grid, UI_BOX_VERTICAL);
+UiContainer *container = ui_box_container(newobj, grid, UI_BOX_VERTICAL);
 newobj->container_begin = container;
 newobj->container_end = container;
 return newobj;
 } else {
 fprintf(stderr, "ui_tabview_select: widget is not a tabview\n");
 void ui_scrolledwindow_add(UiContainerPrivate *ctn, Widget widget) {
 }
-static UiContainerX* ui_scrolledwindow_container(UiObject *obj, Widget scrolledwindow) {
+static UiContainer* ui_scrolledwindow_container(UiObject *obj, Widget scrolledwindow) {
 UiContainerPrivate *ctn = ui_malloc(obj->ctx, sizeof(UiContainerPrivate));
 memset(ctn, 0, sizeof(UiContainerPrivate));
 ctn->prepare = ui_scrolledwindow_prepare;
 ctn->add = ui_scrolledwindow_add;
 ctn->widget = scrolledwindow;
-return (UiContainerX*)ctn;
+return (UiContainer*)ctn;
 }
 UIWIDGET ui_scrolledwindow_create(UiObject* obj, UiFrameArgs *args) {
 UiContainerPrivate *ctn = ui_obj_container(obj);
 UiLayout layout = UI_ARGS2LAYOUT(args);
 Widget parent = ui_container_prepare(ctn, &layout, xargs, &n);
 Widget scrolledwindow = XmCreateScrolledWindow(parent, "scrolledwindow", xargs, n);
 ui_container_add(ctn, scrolledwindow);
-UiContainerX *container = ui_scrolledwindow_container(obj, scrolledwindow);
+UiContainer *container = ui_scrolledwindow_container(obj, scrolledwindow);
 uic_object_push_container(obj, container);
 return scrolledwindow;
 }

Mercurial > hg > toolkit / file comparison

comparison: ui/motif/container.c

ui/motif/container.c