Merge branch 'develop' of https://github.com/cnjinhao/nana into develop

2015-05-17 15:05:44 +09:00
parent 80da9007ef aac94e238b
commit 4289446216
9 changed files with 68 additions and 24 deletions
--- a/source/gui/detail/window_manager.cpp
+++ b/source/gui/detail/window_manager.cpp
@@ -1058,7 +1058,7 @@ namespace detail
 						{
 							++i;
 							core_window_t* ts = (i != end ? (*i) : tabs.front());
-							return (ts != wd ? ts : 0);
+							return (ts != wd ? ts : nullptr);
 						}
 						else
 							return tabs.front();