Mercurial > hg > toolkit / file diff

--- a/ui/winui/commandbar.cpp	Sun Nov 26 15:44:28 2023 +0100
+++ b/ui/winui/commandbar.cpp	Tue Jan 16 12:49:46 2024 +0100
@@ -52,13 +52,12 @@
 
 static void create_appmenu_items(UiObject* obj, Windows::Foundation::Collections::IObservableVector<ICommandBarElement> cb, UiToolbarMenuItem* i);
 
-CommandBar ui_create_toolbar(UiObject *obj) {
+CommandBar ui_create_toolbar(UiObject *obj, CxList* defaults, bool addappmenu) {
 	
 	CommandBar cb = CommandBar();
 	cb.DefaultLabelPosition(CommandBarDefaultLabelPosition::Right);
 
 	// add pre-configured items
-	CxList* defaults = uic_get_toolbar_defaults();
 	CxIterator i = cxListIterator(defaults);
 	cx_foreach(char*, def, i) {
 		UiToolbarItemI* item = uic_toolbar_get_item(def);
@@ -69,11 +68,12 @@
 	}
 
 	// add appmenu
-	UiToolbarMenuItem* appmenu = uic_get_appmenu();
-	if (appmenu) {
-		create_appmenu_items(obj, cb.SecondaryCommands(), appmenu);
+	if (addappmenu) {
+		UiToolbarMenuItem* appmenu = uic_get_appmenu();
+		if (appmenu) {
+			create_appmenu_items(obj, cb.SecondaryCommands(), appmenu);
+		}
 	}
-	
 
 	return cb;
 }