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

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
 

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)

source/gui/filebox.cpp

@@ -16,7 +16,7 @@
 
 #if defined(NANA_WINDOWS)
 	#include <windows.h>
-#elif defined(NANA_LINUX)
+#elif defined(NANA_LINUX) || defined(NANA_MACOS)
 	#include <nana/gui/widgets/label.hpp>
 	#include <nana/gui/widgets/button.hpp>
 	#include <nana/gui/widgets/listbox.hpp>
@@ -32,7 +32,7 @@
 
 namespace nana
 {
-#if defined(NANA_LINUX)
+#if defined(NANA_LINUX) || defined(NANA_MACOS)
 	class filebox_implement
 		: public form
 	{
@@ -1027,7 +1027,7 @@ namespace nana
 				return false;
 			
 			impl_->file.resize(nana::strlen(impl_->file.data()));
-#elif defined(NANA_LINUX)
+#elif defined(NANA_LINUX) || defined(NANA_MACOS)
 			filebox_implement fb(impl_->owner, impl_->open_or_save, impl_->title);
 			
 			if(impl_->filters.size())

source/gui/notifier.cpp

@@ -8,7 +8,9 @@
  *	http://www.boost.org/LICENSE_1_0.txt)
  *
  *	@file: nana/gui/notifier.cpp
- *	@contributors: Jan
+ *	@contributors:
+ *		Jan
+ *		Benjamin Navarro(pr#81)
  */
 #include <nana/deploy.hpp>
 #include <nana/gui/programming_interface.hpp>
@@ -26,7 +28,7 @@
 
 #include <nana/detail/platform_spec_selector.hpp>
 
-#if defined(NANA_LINUX)
+#if defined(NANA_LINUX) || defined(NANA_MACOS)
 #include <nana/system/platform.hpp>
 #include <iostream>
 #endif

source/gui/timer.cpp

@@ -12,6 +12,7 @@
  *		A timer can repeatedly call a piece of code. The duration between
  *	calls is specified in milliseconds. Timer is defferent from other graphics
  *	controls, it has no graphics interface.
+ *	@contributors: Benjamin Navarro(pr#81)
  */
 #include <nana/deploy.hpp>
 #include <nana/gui/timer.hpp>
@@ -26,7 +27,7 @@
 
 #if defined(NANA_WINDOWS)
 #include <windows.h>
-#elif defined(NANA_LINUX)
+#elif defined(NANA_LINUX) || defined(NANA_MACOS)
 #include <nana/detail/platform_spec_selector.hpp>
 #include <nana/system/platform.hpp>
 #endif

source/gui/widgets/listbox.cpp

@@ -8,8 +8,12 @@
  *	http://www.boost.org/LICENSE_1_0.txt)
  *
  *	@file: nana/gui/widgets/listbox.cpp
- *	@contributors:	Hiroshi Seki, Ariel Vina-Rodriguez
- *					leobackes(pr #86)
+ *	@contributors:
+ *		Hiroshi Seki
+ *		Ariel Vina-Rodriguez
+ *		leobackes(pr#86)
+ *		Benjamin Navarro(pr#81)
+ *		
  */
 
 #include <nana/gui/widgets/listbox.hpp>