comparison: ui/winui/commandbar.cpp
ui/winui/commandbar.cpp
- branch
- newapi
- changeset 208
- f632bc0589ab
- parent 207
- 93b9f502cb88
- child 213
- 7e39db525fd9
equal
deleted
inserted
replaced
| 207:93b9f502cb88 | 208:f632bc0589ab |
|---|---|
| 96 | 96 |
| 97 static void create_appmenu_items(UiObject* obj, Windows::Foundation::Collections::IObservableVector<ICommandBarElement> cb, UiToolbarMenuItem* i) { | 97 static void create_appmenu_items(UiObject* obj, Windows::Foundation::Collections::IObservableVector<ICommandBarElement> cb, UiToolbarMenuItem* i) { |
| 98 for (UiMenuItemI* mi = i->menu.items_begin; mi; mi = mi->next) { | 98 for (UiMenuItemI* mi = i->menu.items_begin; mi; mi = mi->next) { |
| 99 // convert UiMenuItemI to UiToolbarItemI | 99 // convert UiMenuItemI to UiToolbarItemI |
| 100 switch (mi->type) { | 100 switch (mi->type) { |
| 101 case UI_MENU_SUBMENU: { | 101 case UI_MENU: { |
| 102 UiMenu* mitem = (UiMenu*)mi; | 102 UiMenu* mitem = (UiMenu*)mi; |
| 103 UiToolbarMenuItem tbitem; | 103 UiToolbarMenuItem tbitem; |
| 104 memset(&tbitem, 0, sizeof(UiToolbarMenuItem)); | 104 memset(&tbitem, 0, sizeof(UiToolbarMenuItem)); |
| 105 tbitem.item.type = UI_TOOLBAR_MENU; | 105 tbitem.item.type = UI_TOOLBAR_MENU; |
| 106 tbitem.args.label = mitem->label; | 106 tbitem.args.label = mitem->label; |
