comparison: ui/winui/appmenu.cpp
ui/winui/appmenu.cpp
- branch
- newapi
- changeset 208
- f632bc0589ab
- parent 207
- 93b9f502cb88
- child 229
- a952760955b4
equal
deleted
inserted
replaced
| 207:93b9f502cb88 | 208:f632bc0589ab |
|---|---|
| 45 | 45 |
| 46 static void add_top_menu_widget(MenuBar &parent, int i, UiMenuItemI* item, UiObject* obj); | 46 static void add_top_menu_widget(MenuBar &parent, int i, UiMenuItemI* item, UiObject* obj); |
| 47 | 47 |
| 48 static void add_menu_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); | 48 static void add_menu_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); |
| 49 static void add_menuitem_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); | 49 static void add_menuitem_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); |
| 50 static void add_menuitem_st_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); | |
| 51 static void add_menuseparator_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); | 50 static void add_menuseparator_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); |
| 52 static void add_checkitem_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); | 51 static void add_checkitem_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); |
| 53 static void add_checkitemnv_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); | 52 static void add_radioitem_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); |
| 54 static void add_menuitem_list_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); | 53 static void add_menuitem_list_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); |
| 54 static void add_menucheckitem_list_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); | |
| 55 static void add_menuradioitem_list_widget(winrt::Windows::Foundation::Collections::IVector<winrt::Microsoft::UI::Xaml::Controls::MenuFlyoutItemBase> parent, int i, UiMenuItemI* item, UiObject* obj); | |
| 55 | 56 |
| 56 static ui_menu_add_f createMenuItem[] = { | 57 static ui_menu_add_f createMenuItem[] = { |
| 57 /* UI_MENU */ add_menu_widget, | 58 /* UI_MENU */ add_menu_widget, |
| 58 /* UI_MENU_SUBMENU */ add_menu_widget, | |
| 59 /* UI_MENU_ITEM */ add_menuitem_widget, | 59 /* UI_MENU_ITEM */ add_menuitem_widget, |
| 60 /* UI_MENU_STOCK_ITEM */ add_menuitem_st_widget, | |
| 61 /* UI_MENU_CHECK_ITEM */ add_checkitem_widget, | 60 /* UI_MENU_CHECK_ITEM */ add_checkitem_widget, |
| 62 /* UI_MENU_CHECK_ITEM_NV */ add_checkitemnv_widget, | 61 /* UI_MENU_RADIO_ITEM */ NULL, // TODO |
| 63 /* UI_MENU_ITEM_LIST */ add_menuitem_list_widget, | 62 /* UI_MENU_ITEM_LIST */ add_menuitem_list_widget, |
| 64 /* UI_MENU_ITEM_LIST_NV */ NULL, // TODO | 63 /* UI_MENU_CHECKITEM_LIST */ NULL, // TODO |
| 64 /* UI_MENU_RADIOITEM_LIST */ NULL, // TODO | |
| 65 /* UI_MENU_SEPARATOR */ add_menuseparator_widget | 65 /* UI_MENU_SEPARATOR */ add_menuseparator_widget |
| 66 }; | 66 }; |
| 67 | 67 |
| 68 winrt::Microsoft::UI::Xaml::Controls::MenuBar ui_create_menubar(UiObject* obj) { | 68 winrt::Microsoft::UI::Xaml::Controls::MenuBar ui_create_menubar(UiObject* obj) { |
| 69 MenuBar mb = MenuBar(); | 69 MenuBar mb = MenuBar(); |
