Merge branch 'hotfix-1.2' into prepare-utf8

2015-12-04 23:44:11 +08:00
parent e8266b5ae8 21a5e2fc2e
commit babcacd63d
28 changed files with 351 additions and 236 deletions
--- a/source/gui/detail/native_window_interface.cpp
+++ b/source/gui/detail/native_window_interface.cpp
@@ -14,7 +14,7 @@
 #include <nana/gui/detail/native_window_interface.hpp>
 #include <nana/gui/screen.hpp>
 #if defined(NANA_WINDOWS)
-	#if defined(NANA_MINGW) && defined(STD_THREAD_NOT_SUPPORTED)
+	#if defined(STD_THREAD_NOT_SUPPORTED)
        #include <nana/std_mutex.hpp>
    #else
        #include <mutex>