Merge branch 'hotfix-1.4' into develop

2016-09-24 09:58:44 +08:00
parent 422f2c768b 0e6ea35858
commit 340c350fcb
16 changed files with 349 additions and 145 deletions
--- a/source/gui/detail/basic_window.cpp
+++ b/source/gui/detail/basic_window.cpp
@@ -442,8 +442,6 @@ namespace nana

 			bool basic_window::set_events(const std::shared_ptr<general_events>& p)
 			{
-				if (annex.events_ptr)
-					return false;
 				annex.events_ptr = p;
 				return true;
 			}