Mercurial > hg > toolkit / file diff

--- a/ui/winui/window.cpp	Thu Dec 11 19:52:44 2025 +0100
+++ b/ui/winui/window.cpp	Thu Dec 11 20:07:16 2025 +0100
@@ -68,89 +68,88 @@
 	obj->wobj->window.Close();
 }
 
-UiObject* ui_window(const char* title, void* window_data) {
-	UiObject* obj = ui_simple_window(title, window_data);
+UiObject* ui_window(const char* title) {
+    UiObject* obj = ui_simple_window(title);
 
-	/*
-	if (uic_get_menu_list()) {
-		// create/add menubar
-		MenuBar mb = ui_create_menubar(obj);
-		mb.VerticalAlignment(VerticalAlignment::Top);
-		obj->container->Add(mb, false);
-	}
-	*/
+    /*
+    if (uic_get_menu_list()) {
+            // create/add menubar
+            MenuBar mb = ui_create_menubar(obj);
+            mb.VerticalAlignment(VerticalAlignment::Top);
+            obj->container->Add(mb, false);
+    }
+    */
 
-	if (uic_toolbar_isenabled()) {
-		// create a grid for the toolbar: ColumnDefinitions="Auto, *, Auto"
-		Grid toolbar_grid = Grid();
-		GridLength gl;
-		gl.Value = 0;
-		gl.GridUnitType = GridUnitType::Auto;
+    if (uic_toolbar_isenabled()) {
+        // create a grid for the toolbar: ColumnDefinitions="Auto, *, Auto"
+        Grid toolbar_grid = Grid();
+        GridLength gl;
+        gl.Value = 0;
+        gl.GridUnitType = GridUnitType::Auto;
 
-		ColumnDefinition coldef0 = ColumnDefinition();
-		coldef0.Width(gl);
-		toolbar_grid.ColumnDefinitions().Append(coldef0);
+        ColumnDefinition coldef0 = ColumnDefinition();
+        coldef0.Width(gl);
+        toolbar_grid.ColumnDefinitions().Append(coldef0);
 
-		gl.Value = 1;
-		gl.GridUnitType = GridUnitType::Star;
-		ColumnDefinition coldef1 = ColumnDefinition();
-		coldef1.Width(gl);
-		toolbar_grid.ColumnDefinitions().Append(coldef1);
+        gl.Value = 1;
+        gl.GridUnitType = GridUnitType::Star;
+        ColumnDefinition coldef1 = ColumnDefinition();
+        coldef1.Width(gl);
+        toolbar_grid.ColumnDefinitions().Append(coldef1);
 
-		gl.Value = 0;
-		gl.GridUnitType = GridUnitType::Auto;
-		ColumnDefinition coldef2 = ColumnDefinition();
-		coldef2.Width(gl);
-		toolbar_grid.ColumnDefinitions().Append(coldef2);
+        gl.Value = 0;
+        gl.GridUnitType = GridUnitType::Auto;
+        ColumnDefinition coldef2 = ColumnDefinition();
+        coldef2.Width(gl);
+        toolbar_grid.ColumnDefinitions().Append(coldef2);
 
-		// rowdef
-		gl.Value = 0;
-		gl.GridUnitType = GridUnitType::Auto;
-		RowDefinition rowdef = RowDefinition();
-		rowdef.Height(gl);
-		toolbar_grid.RowDefinitions().Append(rowdef);
+        // rowdef
+        gl.Value = 0;
+        gl.GridUnitType = GridUnitType::Auto;
+        RowDefinition rowdef = RowDefinition();
+        rowdef.Height(gl);
+        toolbar_grid.RowDefinitions().Append(rowdef);
 
 
-		// create commandbar
-		CxList* def_l = uic_get_toolbar_defaults(UI_TOOLBAR_LEFT);
-		CxList* def_c = uic_get_toolbar_defaults(UI_TOOLBAR_CENTER);
-		CxList* def_r = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHT);
+        // create commandbar
+        CxList* def_l = uic_get_toolbar_defaults(UI_TOOLBAR_LEFT);
+        CxList* def_c = uic_get_toolbar_defaults(UI_TOOLBAR_CENTER);
+        CxList* def_r = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHT);
 
-		bool addappmenu = true;
-		if (cxListSize(def_r) > 0) {
-			CommandBar toolbar_r = ui_create_toolbar(obj, def_r, addappmenu);
-			toolbar_grid.SetColumn(toolbar_r, 2);
-			toolbar_grid.SetRow(toolbar_r, 0);
-			toolbar_grid.Children().Append(toolbar_r);
-			addappmenu = false;
-		}
-		if (cxListSize(def_c) > 0) {
-			CommandBar toolbar_c = ui_create_toolbar(obj, def_c, addappmenu);
-			toolbar_c.HorizontalAlignment(HorizontalAlignment::Center);
-			toolbar_grid.SetColumn(toolbar_c, 1);
-			toolbar_grid.SetRow(toolbar_c, 0);
-			toolbar_grid.Children().Append(toolbar_c);
-			addappmenu = false;
-		}
-		if (cxListSize(def_l) > 0) {
-			CommandBar toolbar_l = ui_create_toolbar(obj, def_l, addappmenu);
-			toolbar_grid.SetColumn(toolbar_l, 0);
-			toolbar_grid.SetRow(toolbar_l, 0);
-			toolbar_grid.Children().Append(toolbar_l);
-		}
+        bool addappmenu = true;
+        if (cxListSize(def_r) > 0) {
+            CommandBar toolbar_r = ui_create_toolbar(obj, def_r, addappmenu);
+            toolbar_grid.SetColumn(toolbar_r, 2);
+            toolbar_grid.SetRow(toolbar_r, 0);
+            toolbar_grid.Children().Append(toolbar_r);
+            addappmenu = false;
+        }
+        if (cxListSize(def_c) > 0) {
+            CommandBar toolbar_c = ui_create_toolbar(obj, def_c, addappmenu);
+            toolbar_c.HorizontalAlignment(HorizontalAlignment::Center);
+            toolbar_grid.SetColumn(toolbar_c, 1);
+            toolbar_grid.SetRow(toolbar_c, 0);
+            toolbar_grid.Children().Append(toolbar_c);
+            addappmenu = false;
+        }
+        if (cxListSize(def_l) > 0) {
+            CommandBar toolbar_l = ui_create_toolbar(obj, def_l, addappmenu);
+            toolbar_grid.SetColumn(toolbar_l, 0);
+            toolbar_grid.SetRow(toolbar_l, 0);
+            toolbar_grid.Children().Append(toolbar_l);
+        }
 
-		toolbar_grid.VerticalAlignment(VerticalAlignment::Top);
-		obj->container->Add(toolbar_grid, false);
-	}
+        toolbar_grid.VerticalAlignment(VerticalAlignment::Top);
+        obj->container->Add(toolbar_grid, false);
+    }
 
-	return obj;
+    return obj;
 }
 
-UIEXPORT UiObject* ui_simple_window(const char *title, void *window_data) {
+UIEXPORT UiObject* ui_simple_window(const char *title) {
 	UiObject* obj = uic_object_new_toplevel();
 
 	obj->ctx = uic_context(obj, mp);
-	obj->window = window_data;
 
 	Window window = Window();
 	//Window window = make<winui::implementation::MainWindow>();