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/paint/graphics.cpp
+++ b/source/paint/graphics.cpp
@@ -953,7 +953,7 @@ namespace paint
 			{
 				const nana::char_t * end = str + len;
 				const nana::char_t * i = std::find(str, end, '\t');
-#if defined(NANA_LINUX)
+#if defined(NANA_LINUX) || defined(NANA_MACOS)
 				handle_->update_text_color();
 #endif
 				if (i != end)