using C++17 emplace return type

2018-08-27 06:51:20 +08:00
parent fe185e382b
commit 81d667dbd7
12 changed files with 78 additions and 13 deletions
--- a/source/gui/widgets/menubar.cpp
+++ b/source/gui/widgets/menubar.cpp
@@ -89,11 +89,18 @@ namespace nana

 					if (shortkey && shortkey < 0x61)
 						shortkey += (0x61 - 0x41);
+
+#ifdef _nana_std_has_emplace_return_type
+					auto & last = items.emplace_back(new item_type{std::move(transformed_text), shortkey, shortkey_pos});
+					API::refresh_window(*widget_ptr);
+					return last->menu_obj;
+#else
 					items.emplace_back(new item_type{ std::move(transformed_text), shortkey, shortkey_pos });

 					API::refresh_window(*widget_ptr);

 					return this->items.back()->menu_obj;
+#endif
 				}
 				
 				bool cancel()