Merge branch 'develop-c++17' into develop

2018-06-04 02:29:55 +08:00
parent d5f8f8b305 163223e46f
commit a9f23e2503
35 changed files with 270 additions and 86 deletions
--- a/source/gui/widgets/button.cpp
+++ b/source/gui/widgets/button.cpp
@@ -27,7 +27,7 @@ namespace nana{	namespace drawerbase
 				: trigger_{ t }
 			{}

-			optional<size> measure(graph_reference graph, unsigned limit_pixels, bool /*limit_width*/) const override
+			std::optional<size> measure(graph_reference graph, unsigned limit_pixels, bool /*limit_width*/) const override
 			{
 				//Button doesn't provide a support of vfit and hfit
 				if (limit_pixels)