Mercurial > hg > toolkit / changeset

--- a/ui/common/container.c	Tue May 05 20:27:58 2026 +0200
+++ b/ui/common/container.c	Wed May 06 22:09:48 2026 +0200
@@ -33,13 +33,13 @@
     if(!obj->container_end) {
         return;
     }
-    UiContainerX *rm = obj->container_end;
+    UiContainer *rm = obj->container_end;
     uic_object_pop_container(obj);
     ui_free(obj->ctx, rm);
 }
 
 void ui_newline(UiObject *obj) {
-    UiContainerX *container = obj->container_end;
+    UiContainer *container = obj->container_end;
     if(container) {
         container->newline = TRUE;
     }

--- a/ui/common/object.c	Tue May 05 20:27:58 2026 +0200
+++ b/ui/common/object.c	Wed May 06 22:09:48 2026 +0200
@@ -119,7 +119,7 @@
     return newobj;
 }
 
-void uic_object_push_container(UiObject *toplevel, UiContainerX *newcontainer) {
+void uic_object_push_container(UiObject *toplevel, UiContainer *newcontainer) {
     newcontainer->prev = toplevel->container_end;
     if(toplevel->container_end) {
         toplevel->container_end->next = newcontainer;
@@ -148,8 +148,8 @@
  */
 void uic_object_remove_second_last_container(UiObject *toplevel) {
     if(toplevel->container_end && toplevel->container_end->prev) {
-        UiContainerX *end = toplevel->container_end;
-        UiContainerX *rm = toplevel->container_end->prev;
+        UiContainer *end = toplevel->container_end;
+        UiContainer *rm = toplevel->container_end->prev;
         
         end->prev = rm->prev;
         if(rm->prev) {

--- a/ui/common/object.h	Tue May 05 20:27:58 2026 +0200
+++ b/ui/common/object.h	Wed May 06 22:09:48 2026 +0200
@@ -55,7 +55,7 @@
 UiObject* uic_object_new(UiObject *toplevel, UIWIDGET widget);
 UiObject* uic_ctx_object_new(UiContext *ctx, UIWIDGET widget);
 
-void uic_object_push_container(UiObject *toplevel, UiContainerX *newcontainer);
+void uic_object_push_container(UiObject *toplevel, UiContainer *newcontainer);
 void uic_object_pop_container(UiObject *toplevel);
 void uic_object_remove_second_last_container(UiObject *toplevel);
 

--- a/ui/gtk/container.c	Tue May 05 20:27:58 2026 +0200
+++ b/ui/gtk/container.c	Wed May 06 22:09:48 2026 +0200
@@ -43,12 +43,12 @@
 
 
 void ui_container_begin_close(UiObject *obj) {
-    UiContainerX *ct = obj->container_end;
+    UiContainer *ct = obj->container_end;
     ct->close = 1;
 }
 
 int ui_container_finish(UiObject *obj) {
-    UiContainerX *ct = obj->container_end;
+    UiContainer *ct = obj->container_end;
     if(ct->close) {
         ui_end_new(obj);
         return 0;
@@ -82,7 +82,7 @@
 {
     GtkWidget *sub = NULL;
     GtkWidget *add = NULL;
-    UiContainerX *container = NULL;
+    UiContainer *container = NULL;
     switch(type) {
         default: {
             sub = ui_gtk_vbox_new(spacing);
@@ -125,11 +125,11 @@
     container->container.widget = widget;
     container->add = add_child;
     container->userdata = userdata;
-    uic_object_push_container(obj, (UiContainerX*)container);
+    uic_object_push_container(obj, (UiContainer*)container);
 }
 
 /* -------------------- Box Container -------------------- */
-UiContainerX* ui_box_container(UiObject *obj, GtkWidget *box, UiSubContainerType type) {
+UiContainer* ui_box_container(UiObject *obj, GtkWidget *box, UiSubContainerType type) {
     UiBoxContainer *ct = cxCalloc(
             obj->ctx->allocator,
             1,
@@ -137,7 +137,7 @@
     ct->container.widget = box;
     ct->container.add = ui_box_container_add;
     ct->type = type;
-    return (UiContainerX*)ct;
+    return (UiContainer*)ct;
 }
 
 void ui_box_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout) {
@@ -172,7 +172,7 @@
 #endif
 }
 
-UiContainerX* ui_grid_container(
+UiContainer* ui_grid_container(
         UiObject *obj,
         GtkWidget *grid,
         UiBool def_hexpand,
@@ -192,7 +192,7 @@
     ct->container.add = ui_grid_container_add;
     UI_GTK_V2(ct->width = 0);
     UI_GTK_V2(ct->height = 1);
-    return (UiContainerX*)ct;
+    return (UiContainer*)ct;
 }
 
 
@@ -271,14 +271,14 @@
 }
 #endif
 
-UiContainerX* ui_frame_container(UiObject *obj, GtkWidget *frame) {
+UiContainer* ui_frame_container(UiObject *obj, GtkWidget *frame) {
     UiContainerPrivate *ct = cxCalloc(
             obj->ctx->allocator,
             1,
             sizeof(UiContainerPrivate));
     ct->widget = frame;
     ct->add = ui_frame_container_add;
-    return (UiContainerX*)ct;
+    return (UiContainer*)ct;
 }
 
 void ui_frame_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout) {
@@ -286,14 +286,14 @@
     FRAME_SET_CHILD(ct->widget, widget);
 }
 
-UiContainerX* ui_expander_container(UiObject *obj, GtkWidget *expander) {
+UiContainer* ui_expander_container(UiObject *obj, GtkWidget *expander) {
     UiContainerPrivate *ct = cxCalloc(
             obj->ctx->allocator,
             1,
             sizeof(UiContainerPrivate));
     ct->widget = expander;
     ct->add = ui_expander_container_add;
-    return (UiContainerX*)ct;
+    return (UiContainer*)ct;
 }
 
 void ui_expander_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout) {
@@ -307,24 +307,24 @@
     SCROLLEDWINDOW_SET_CHILD(ct->widget, widget);
 }
 
-UiContainerX* ui_scrolledwindow_container(UiObject *obj, GtkWidget *scrolledwindow) {
+UiContainer* ui_scrolledwindow_container(UiObject *obj, GtkWidget *scrolledwindow) {
     UiContainerPrivate *ct = cxCalloc(
             obj->ctx->allocator,
             1,
             sizeof(UiContainerPrivate));
     ct->widget = scrolledwindow;
     ct->add = ui_scrolledwindow_container_add;
-    return (UiContainerX*)ct;
+    return (UiContainer*)ct;
 }
 
-UiContainerX* ui_tabview_container(UiObject *obj, GtkWidget *tabview) {
+UiContainer* ui_tabview_container(UiObject *obj, GtkWidget *tabview) {
     UiTabViewContainer *ct = cxCalloc(
             obj->ctx->allocator,
             1,
             sizeof(UiTabViewContainer));
     ct->container.widget = tabview;
     ct->container.add = ui_tabview_container_add;
-    return (UiContainerX*)ct;
+    return (UiContainer*)ct;
 }
 
 void ui_tabview_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout) {
@@ -390,7 +390,7 @@
     ui_set_name_and_style(box, args->name, args->style_class);
     ct->add(ct, box, &layout);
     
-    UiContainerX *container = ui_box_container(obj, box, type);
+    UiContainer *container = ui_box_container(obj, box, type);
     uic_object_push_container(obj, container);
     
     uic_widget_set_visibility_states(obj->ctx, box, args->visibility_states);
@@ -428,7 +428,7 @@
     ui_set_name_and_style(grid, args->name, args->style_class);
     ct->add(ct, grid, &layout);
     
-    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);
@@ -476,7 +476,7 @@
     if(sub) {
         FRAME_SET_CHILD(frame, sub);
     } else {
-        UiContainerX *container = ui_frame_container(obj, frame);
+        UiContainer *container = ui_frame_container(obj, frame);
         uic_object_push_container(obj, container);
     }
     
@@ -502,7 +502,7 @@
     if(sub) {
         EXPANDER_SET_CHILD(expander, sub);
     } else {
-        UiContainerX *container = ui_expander_container(obj, expander);
+        UiContainer *container = ui_expander_container(obj, expander);
         uic_object_push_container(obj, container);
     }
     
@@ -529,7 +529,7 @@
     if(sub) {
         SCROLLEDWINDOW_SET_CHILD(sw, sub);
     } else {
-        UiContainerX *container = ui_scrolledwindow_container(obj, sw);
+        UiContainer *container = ui_scrolledwindow_container(obj, sw);
         uic_object_push_container(obj, container);
     }
     
@@ -821,7 +821,7 @@
     UiLayout layout = UI_ARGS2LAYOUT(args);
     ct->add(ct, widget, &layout);
     
-    UiContainerX *container = ui_tabview_container(obj, widget);
+    UiContainer *container = ui_tabview_container(obj, widget);
     uic_object_push_container(obj, container);
     
     uic_widget_set_visibility_states(obj->ctx, widget, args->visibility_states);
@@ -830,7 +830,7 @@
 }
 
 static GtkWidget* create_tab(UiObject *obj, UiGtkTabView *tabview, const char *title, int tab) {
-    UiContainerX *container;
+    UiContainer *container;
     GtkWidget *sub;
     switch(tabview->subcontainer) {
         default: {
@@ -916,7 +916,7 @@
             sizeof(UiHeaderbarContainer));
     memcpy(hb, ct, sizeof(UiHeaderbarContainer));
     hb->part = part;
-    uic_object_push_container(obj, (UiContainerX*)hb);
+    uic_object_push_container(obj, (UiContainer*)hb);
 }
 
 void ui_headerbar_start_create(UiObject *obj) {
@@ -939,7 +939,7 @@
     ui_set_name_and_style(box, args->name, args->style_class);
     ct->add(ct, box, &layout);
     
-    UiContainerX *container = ui_headerbar_fallback_container(obj, box);
+    UiContainer *container = ui_headerbar_fallback_container(obj, box);
     uic_object_push_container(obj, container);
     
     return box;
@@ -949,21 +949,21 @@
      UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end;
     GtkWidget *headerbar = ct->widget;
     
-    UiContainerX *container = ui_headerbar_container(obj, headerbar);
+    UiContainer *container = ui_headerbar_container(obj, headerbar);
     uic_object_push_container(obj, container);
     
     UiHeaderbarContainer *hb = (UiHeaderbarContainer*)container;
     hb->part = part;
 }
 
-UiContainerX* ui_headerbar_fallback_container(UiObject *obj, GtkWidget *headerbar) {
+UiContainer* ui_headerbar_fallback_container(UiObject *obj, GtkWidget *headerbar) {
     UiHeaderbarContainer *ct = cxCalloc(
             obj->ctx->allocator,
             1,
             sizeof(UiHeaderbarContainer));
     ct->container.widget = headerbar;
     ct->container.add = ui_headerbar_fallback_container_add;
-    return (UiContainerX*)ct;
+    return (UiContainer*)ct;
 }
 
 void ui_headerbar_fallback_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout) {
@@ -979,20 +979,20 @@
         return ui_headerbar_fallback_create(obj, args);
     }
     
-    UiContainerX *container = ui_headerbar_container(obj, headerbar);
+    UiContainer *container = ui_headerbar_container(obj, headerbar);
     uic_object_push_container(obj, container);
     
     return headerbar;    
 }
 
-UiContainerX* ui_headerbar_container(UiObject *obj, GtkWidget *headerbar) {
+UiContainer* ui_headerbar_container(UiObject *obj, GtkWidget *headerbar) {
     UiHeaderbarContainer *ct = cxCalloc(
             obj->ctx->allocator,
             1,
             sizeof(UiHeaderbarContainer));
     ct->container.widget = headerbar;
     ct->container.add = ui_headerbar_container_add;
-    return (UiContainerX*)ct;
+    return (UiContainer*)ct;
 }
 
 void ui_headerbar_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout) {
@@ -1035,7 +1035,7 @@
     ui_gtk_set_margin(box, args->margin, args->margin_left, args->margin_right, args->margin_top, args->margin_bottom);
     adw_toolbar_view_set_content(ADW_TOOLBAR_VIEW(sidebar_toolbar_view), box);
     
-    UiContainerX *container = ui_box_container(obj, box, UI_CONTAINER_VBOX);
+    UiContainer *container = ui_box_container(obj, box, UI_CONTAINER_VBOX);
     uic_object_push_container(obj, container);
     
     return box;
@@ -1048,7 +1048,7 @@
     ui_gtk_set_margin(box, args->margin, args->margin_left, args->margin_right, args->margin_top, args->margin_bottom);
     BOX_ADD_EXPAND(sidebar_vbox, box);
     
-    UiContainerX *container = ui_box_container(obj, box, UI_CONTAINER_VBOX);
+    UiContainer *container = ui_box_container(obj, box, UI_CONTAINER_VBOX);
     uic_object_push_container(obj, container);
     
     return box;
@@ -1068,7 +1068,7 @@
     ui_gtk_set_margin(box, args->margin, args->margin_left, args->margin_right, args->margin_top, args->margin_bottom);
     BOX_ADD_EXPAND(pbox, box);
     
-    UiContainerX *container = ui_box_container(obj, box, UI_CONTAINER_VBOX);
+    UiContainer *container = ui_box_container(obj, box, UI_CONTAINER_VBOX);
     uic_object_push_container(obj, container);
     
     return box;
@@ -1135,7 +1135,7 @@
     }
     
     UiSplitPane *splitpane = ui_create_splitpane_data(pane0, orientation, max, args->initial_position);
-    UiContainerX *container = ui_splitpane_container(obj, pane0, splitpane);
+    UiContainer *container = ui_splitpane_container(obj, pane0, splitpane);
     uic_object_push_container(obj, container);
     
     g_object_set_data(G_OBJECT(pane0), "ui_splitpane", splitpane);
@@ -1172,12 +1172,12 @@
     return ct;
 }
 
-UiContainerX* ui_splitpane_container(UiObject *obj, GtkWidget *pane, UiSplitPane *data) {
+UiContainer* ui_splitpane_container(UiObject *obj, GtkWidget *pane, UiSplitPane *data) {
     UiSplitPaneContainer *ct = ui_calloc(obj->ctx, 1, sizeof(UiSplitPaneContainer));
     ct->container.widget = pane;
     ct->container.add = ui_splitpane_container_add;
     ct->splitpane = data;
-    return (UiContainerX*)ct;
+    return (UiContainer*)ct;
 }
 
 void ui_splitpane_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout) {

--- a/ui/gtk/container.h	Tue May 05 20:27:58 2026 +0200
+++ b/ui/gtk/container.h	Wed May 06 22:09:48 2026 +0200
@@ -50,7 +50,7 @@
 
 typedef struct UiContainerPrivate UiContainerPrivate;
 struct UiContainerPrivate {
-    UiContainerX container;
+    UiContainer container;
     GtkWidget *widget;
     UIMENU menu;
     
@@ -160,11 +160,11 @@
 GtkWidget* ui_gtk_set_margin(GtkWidget *widget, int margin, int margin_left, int margin_right, int margin_top, int margin_bottom);
 UIWIDGET ui_box_create(UiObject *obj, UiContainerArgs *args, UiSubContainerType type);
 
-UiContainerX* ui_box_container(UiObject *obj, GtkWidget *box, UiSubContainerType type);
+UiContainer* ui_box_container(UiObject *obj, GtkWidget *box, UiSubContainerType type);
 void ui_box_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout);
 
 GtkWidget* ui_create_grid_widget(int colspacing, int rowspacing);
-UiContainerX* ui_grid_container(
+UiContainer* ui_grid_container(
         UiObject *obj,
         GtkWidget *grid,
         UiBool def_hexpand,
@@ -173,20 +173,20 @@
         UiBool def_vfill);
 void ui_grid_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout);
 
-UiContainerX* ui_frame_container(UiObject *obj, GtkWidget *frame);
+UiContainer* ui_frame_container(UiObject *obj, GtkWidget *frame);
 void ui_frame_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout);
 
-UiContainerX* ui_expander_container(UiObject *obj, GtkWidget *expander);
+UiContainer* ui_expander_container(UiObject *obj, GtkWidget *expander);
 void ui_expander_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout);
 
-UiContainerX* ui_scrolledwindow_container(UiObject *obj, GtkWidget *scrolledwindow);
+UiContainer* ui_scrolledwindow_container(UiObject *obj, GtkWidget *scrolledwindow);
 void ui_scrolledwindow_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout);
 
-UiContainerX* ui_tabview_container(UiObject *obj, GtkWidget *tabview);
+UiContainer* ui_tabview_container(UiObject *obj, GtkWidget *tabview);
 void ui_tabview_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout);
 
 UiSplitPane* ui_create_splitpane_data(GtkWidget *pane, UiOrientation orientation, int max, int init);
-UiContainerX* ui_splitpane_container(UiObject *obj, GtkWidget *pane, UiSplitPane *data);
+UiContainer* ui_splitpane_container(UiObject *obj, GtkWidget *pane, UiSplitPane *data);
 void ui_splitpane_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout);
 
 int64_t ui_splitpane_get(UiInteger *i);
@@ -197,11 +197,11 @@
 void ui_gtk_notebook_select_tab(GtkWidget *widget, int tab);
 
 #if GTK_CHECK_VERSION(3, 10, 0)
-UiContainerX* ui_headerbar_container(UiObject *obj, GtkWidget *headerbar);
+UiContainer* ui_headerbar_container(UiObject *obj, GtkWidget *headerbar);
 void ui_headerbar_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout);
 #endif
 
-UiContainerX* ui_headerbar_fallback_container(UiObject *obj, GtkWidget *headerbar);
+UiContainer* ui_headerbar_fallback_container(UiObject *obj, GtkWidget *headerbar);
 void ui_headerbar_fallback_container_add(UiContainerPrivate *ct, GtkWidget *widget, UiLayout *layout);
 
 #ifdef	__cplusplus

--- a/ui/gtk/window.c	Tue May 05 20:27:58 2026 +0200
+++ b/ui/gtk/window.c	Wed May 06 22:09:48 2026 +0200
@@ -398,7 +398,7 @@
     gtk_container_add(GTK_CONTAINER(frame), content_box);
     obj->container = ui_box_container(obj, content_box);
     */
-    UiContainerX *container = ui_box_container(obj, content_box, UI_CONTAINER_VBOX);
+    UiContainer *container = ui_box_container(obj, content_box, UI_CONTAINER_VBOX);
     uic_object_push_container(obj, container);
     
     nwindows++;
@@ -975,7 +975,7 @@
 #endif
     
     GtkWidget *content_vbox = ui_gtk_vbox_new(0);
-    UiContainerX *container = ui_box_container(obj, content_vbox, UI_CONTAINER_VBOX);
+    UiContainer *container = ui_box_container(obj, content_vbox, UI_CONTAINER_VBOX);
     uic_object_push_container(obj, container);
     if(args->lbutton1 || args->lbutton2 || args->rbutton3 || args->rbutton4) {
 #if GTK_CHECK_VERSION(3, 10, 0)

--- a/ui/motif/container.c	Tue May 05 20:27:58 2026 +0200
+++ b/ui/motif/container.c	Wed May 06 22:09:48 2026 +0200
@@ -87,7 +87,7 @@
     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);
@@ -105,14 +105,14 @@
     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) {
@@ -170,7 +170,7 @@
     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);
@@ -178,7 +178,7 @@
     return grid;
 }
 
-UiContainerX* ui_grid_container(
+UiContainer* ui_grid_container(
         UiObject *obj,
         Widget grid,
         UiBool def_hexpand,
@@ -197,7 +197,7 @@
     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) {
@@ -275,7 +275,7 @@
         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 = {
@@ -308,13 +308,13 @@
     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) {
@@ -472,7 +472,7 @@
         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);
     
@@ -556,7 +556,7 @@
         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;
@@ -693,13 +693,13 @@
     
 }
 
-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) {
@@ -721,7 +721,7 @@
     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;

--- a/ui/motif/container.h	Tue May 05 20:27:58 2026 +0200
+++ b/ui/motif/container.h	Wed May 06 22:09:48 2026 +0200
@@ -72,7 +72,7 @@
 
 
 struct UiContainerPrivate {
-    UiContainerX    container;
+    UiContainer    container;
     Widget          (*prepare)(UiContainerPrivate*, UiLayout *layout, Arg *, int*);
     void            (*add)(UiContainerPrivate*, Widget);
     Widget          widget;
@@ -144,13 +144,13 @@
 Widget ui_tabview_container_prepare(UiContainerPrivate *ctn, UiLayout *layout, Arg *args, int *n);
 void ui_tabview_container_add(UiContainerPrivate *ctn, Widget widget);
 
-UiContainerX* ui_box_container(UiObject *obj, Widget grid, UiBoxOrientation orientation);
+UiContainer* ui_box_container(UiObject *obj, Widget grid, UiBoxOrientation orientation);
 Widget ui_vbox_prepare(UiContainerPrivate *ctn, UiLayout *layout, Arg *args, int *n);
 Widget ui_hbox_prepare(UiContainerPrivate *ctn, UiLayout *layout, Arg *args, int *n);
 void ui_box_container_add(UiContainerPrivate *ctn, Widget widget);
 
 
-UiContainerX* ui_grid_container(
+UiContainer* ui_grid_container(
         UiObject *obj,
         Widget grid,
         UiBool def_hexpand,
@@ -160,7 +160,7 @@
 Widget ui_grid_container_prepare(UiContainerPrivate *ctn, UiLayout *layout, Arg *args, int *n);
 void ui_grid_container_add(UiContainerPrivate *ctn, Widget widget);
 
-UiContainerX* ui_frame_container(UiObject *obj, Widget frame);
+UiContainer* ui_frame_container(UiObject *obj, Widget frame);
 Widget ui_frame_container_prepare(UiContainerPrivate *ctn, UiLayout *layout, Arg *args, int *n);
 void ui_frame_container_add(UiContainerPrivate *ctn, Widget widget);
 

--- a/ui/motif/window.c	Tue May 05 20:27:58 2026 +0200
+++ b/ui/motif/window.c	Wed May 06 22:09:48 2026 +0200
@@ -142,7 +142,7 @@
     XtSetArg(args[n], XmNleftAttachment, XmATTACH_FORM); n++;
     XtSetArg(args[n], XmNrightAttachment, XmATTACH_FORM); n++;
     Widget vbox = XtCreateManagedWidget("window_vbox", gridClass, form, args, n);
-    UiContainerX *container = ui_box_container(obj, vbox, UI_BOX_VERTICAL);
+    UiContainer *container = ui_box_container(obj, vbox, UI_BOX_VERTICAL);
     uic_object_push_container(obj, container);
     
     obj->widget = toplevel;

--- a/ui/qt/container.cpp	Tue May 05 20:27:58 2026 +0200
+++ b/ui/qt/container.cpp	Wed May 06 22:09:48 2026 +0200
@@ -43,7 +43,7 @@
 }
 
 void ui_obj_add_container(UiObject *obj, UiContainerPrivate *ct) {
-    UiContainerX *container = (UiContainerX*)ui_malloc(obj->ctx, sizeof(UiContainerX));
+    UiContainer *container = (UiContainer*)ui_malloc(obj->ctx, sizeof(UiContainer));
     container->close = 0;
     container->container = ct;
     container->prev = NULL;

--- a/ui/qt/container.h	Tue May 05 20:27:58 2026 +0200
+++ b/ui/qt/container.h	Wed May 06 22:09:48 2026 +0200
@@ -41,11 +41,11 @@
 #include <QSplitter>
 #include <QGroupBox>
 
-#define ui_obj_container(obj) (UiContainerPrivate*)((UiContainerX*)obj->container_end)->container
+#define ui_obj_container(obj) (UiContainerPrivate*)((UiContainer*)obj->container_end)->container
 
 struct UiContainerPrivate {
     UIWIDGET current;
-    UiContainerX *container;
+    UiContainer *container;
 
     virtual void add(QWidget *widget, UiLayout& layout) = 0;
     virtual void end() {}

--- a/ui/server/container.c	Tue May 05 20:27:58 2026 +0200
+++ b/ui/server/container.c	Wed May 06 22:09:48 2026 +0200
@@ -34,12 +34,12 @@
 #include "args.h"
 
 void ui_container_begin_close(UiObject *obj) {
-    UiContainerX *ct = obj->container_end;
+    UiContainer *ct = obj->container_end;
     ct->close = 1;
 }
 
 int ui_container_finish(UiObject *obj) {
-    UiContainerX *ct = obj->container_end;
+    UiContainer *ct = obj->container_end;
     if(ct->close) {
         ui_end_new(obj);
         return 0;
@@ -47,8 +47,8 @@
     return 1;
 }
 
-UiContainerX* ui_widget_container(UiWidget *w) {
-    UiContainerX *container = cxZalloc(w->obj->ctx->allocator, sizeof(UiContainerX));
+UiContainer* ui_widget_container(UiWidget *w) {
+    UiContainer *container = cxZalloc(w->obj->ctx->allocator, sizeof(UiContainer));
     container->container = w;
     return container;
 }

--- a/ui/server/container.h	Tue May 05 20:27:58 2026 +0200
+++ b/ui/server/container.h	Wed May 06 22:09:48 2026 +0200
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-UiContainerX* ui_widget_container(UiWidget *w);
+UiContainer* ui_widget_container(UiWidget *w);
 
 cxmutstr ui_container_args_to_string(UiContext *ctx, UiContainerArgs *args);
 

--- a/ui/ui/container.h	Tue May 05 20:27:58 2026 +0200
+++ b/ui/ui/container.h	Wed May 06 22:09:48 2026 +0200
@@ -285,12 +285,12 @@
     int          rowspan;
 };
 
-struct UiContainerX {
+struct UiContainer {
     void *container;
     UiBool close;
     UiBool newline;
-    UiContainerX *prev;
-    UiContainerX *next;
+    UiContainer *prev;
+    UiContainer *next;
 };
 
 

--- a/ui/ui/toolkit.h	Tue May 05 20:27:58 2026 +0200
+++ b/ui/ui/toolkit.h	Wed May 06 22:09:48 2026 +0200
@@ -183,7 +183,6 @@
 #endif
 
 typedef struct UiObject     UiObject;
-typedef struct UiContainerX UiContainerX;
 typedef struct UiEvent      UiEvent;
 typedef struct UiMouseEvent UiMouseEvent;
 typedef struct UiObserver   UiObserver;
@@ -292,8 +291,8 @@
      * container list
      * TODO: remove old UiContainer and rename UiContainerX to UiContainer
      */
-    UiContainerX *container_begin;
-    UiContainerX *container_end;
+    UiContainer *container_begin;
+    UiContainer *container_end;
     
     /*
      * next container object
@@ -388,7 +387,6 @@
     int   datatype;
     void  *data1;
     void  *data2;
-    // TODO: replacefunc, ...
     UiObserver *observers;
 };
 
@@ -555,8 +553,6 @@
 UIEXPORT void  ui_document_unref(void *doc);
 UIEXPORT void  ui_document_destroy(void *doc);
 
-UIEXPORT void* ui_get_subdocument(void *document);               // deprecated
-
 UIEXPORT UiContext* ui_document_context(void *doc);
 UIEXPORT void* ui_context_document(UiContext *ctx);
 UIEXPORT UiObject* ui_context_obj(UiContext *ctx);