Merge branch 'hotfix-1.5.1' into develop

2017-06-21 22:52:47 +08:00
parent ad55c51a3e 0b4dc1904b
commit cbb42259bd
16 changed files with 29 additions and 21 deletions
--- a/source/gui/widgets/skeletons/text_editor.cpp
+++ b/source/gui/widgets/skeletons/text_editor.cpp
@@ -445,7 +445,7 @@ namespace nana{	namespace widgets
 					);
 			}

-			bool clear()
+			bool clear() override
 			{
 				if (colored_areas_.empty())
 					return false;