Merge branch 'develop' into prepare-utf8

2016-01-03 14:18:03 +08:00
parent 0a4f04267e cd5a0bf554
commit 0bb7c788d5
13 changed files with 522 additions and 108 deletions
--- a/source/gui/programming_interface.cpp
+++ b/source/gui/programming_interface.cpp
@@ -542,8 +542,8 @@ namespace API
 	{
 		auto iwd = reinterpret_cast<basic_window*>(wd);
 		internal_scope_guard lock;
-		if(restrict::wd_manager().available(iwd))
-			return reinterpret_cast<window>(iwd->other.category == category::flags::root ? iwd->owner : iwd->parent);
+		if (restrict::wd_manager().available(iwd))
+			return reinterpret_cast<window>(iwd->parent);

 		return nullptr;
 	}