mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove member type menu::item_type

Browse Source
This commit is contained in:
Jinhao 2017-05-04 06:10:54 +08:00
parent 74707820bf
commit bbaf599272
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/nana/gui/widgets/menu.hpp
View File

@ -117,9 +117,8 @@ namespace nana
typedef drawerbase::menu::checks checks; typedef drawerbase::menu::checks checks;
typedef drawerbase::menu::renderer_interface renderer_interface; typedef drawerbase::menu::renderer_interface renderer_interface;
typedef drawerbase::menu::menu_item_type item_type; typedef drawerbase::menu::menu_item_type::item_proxy item_proxy;
typedef item_type::item_proxy item_proxy; typedef drawerbase::menu::menu_item_type::event_fn_t event_fn_t; ///< A callback functor type. Prototype: `void(item_proxy&)`
typedef item_type::event_fn_t event_fn_t; ///< A callback functor type. Prototype: `void(item_proxy&)`
menu(); ///< The default constructor. NO OTHER CONSTRUCTOR. menu(); ///< The default constructor. NO OTHER CONSTRUCTOR.
~menu(); ~menu();

2
source/gui/widgets/menu.cpp
View File

@ -1128,6 +1128,8 @@ namespace nana
delete impl_; delete impl_;
} }
using item_type = drawerbase::menu::menu_item_type;
auto menu::append(std::string text_utf8, const menu::event_fn_t& handler) -> item_proxy auto menu::append(std::string text_utf8, const menu::event_fn_t& handler) -> item_proxy
{ {
std::unique_ptr<item_type> item{ new item_type{ std::move(text_utf8), handler } }; std::unique_ptr<item_type> item{ new item_type{ std::move(text_utf8), handler } };