Merge branch 'macos' of https://github.com/BenjaminNavarro/nana into BenjaminNavarro-macos

2015-11-10 23:21:07 +08:00
parent 9d49877a74 a09d5c3c95
commit 94c10c8fba
28 changed files with 2235 additions and 86 deletions
--- a/source/gui/detail/bedrock_selector.cpp
+++ b/source/gui/detail/bedrock_selector.cpp
@@ -17,7 +17,7 @@

 #if defined(NANA_WINDOWS)
 	#include "win32/bedrock.cpp"
-#elif defined(NANA_LINUX)
+#elif defined(NANA_LINUX) || defined(NANA_MACOS)
 	#include "linux_X11/bedrock.cpp"
 #endif

--- a/source/gui/detail/window_manager.cpp
+++ b/source/gui/detail/window_manager.cpp
@@ -745,7 +745,7 @@ namespace detail
 				}

 				//Copy the root buffer that wd specified into DeviceContext
-#if defined(NANA_LINUX)
+#if defined(NANA_LINUX) || defined(NANA_MACOS)
 				wd->drawer.map(reinterpret_cast<window>(wd), forced, update_area);
 #elif defined(NANA_WINDOWS)
 				if(nana::system::this_thread_id() == wd->thread_id)