Merge branch 'hotfix-1.2' into prepare-utf8

source/detail/platform_spec_posix.cpp

@@ -15,6 +15,7 @@
  */
 
 #include <nana/detail/platform_spec_selector.hpp>
+#if defined(NANA_POSIX) && defined(NANA_X11)
 #include <X11/Xlocale.h>
 #include <locale>
 #include <map>
@@ -28,7 +29,7 @@
 #include <errno.h>
 #include <sstream>
 
-#include "msg_dispatcher.hpp"
+#include "x11/msg_dispatcher.hpp"
 
 namespace nana
 {
@@ -1412,3 +1413,4 @@ namespace detail
 	}
 }//end namespace detail
 }//end namespace nana
+#endif //NANA_POSIX && NANA_X11

source/detail/platform_spec_selector.cpp

@@ -1,22 +0,0 @@
-/*
- *	Platform Specification Selector
- *	Nana C++ Library(http://www.nanapro.org)
- *	Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
- *
- *	Distributed under the Nana Software License, Version 1.0.
- *	(See accompanying file LICENSE_1_0.txt or copy at
- *	http://nanapro.org/LICENSE_1_0.txt)
- *
- *	@file: nana/detail/platform_spec_selector.cpp
- *
- *  This file is used to support the Nana project of some cross-platform IDE,
- *
- */
-
-#include <nana/config.hpp>
-
-#if defined(NANA_WINDOWS)
-	#include "win32/platform_spec.cpp"
-#elif defined(NANA_LINUX) || defined(NANA_MACOS)
-	#include "linux_X11/platform_spec.cpp"
-#endif

source/detail/platform_spec_windows.cpp

@@ -13,6 +13,9 @@
  */
 
 #include <nana/detail/platform_spec_selector.hpp>
+
+#if defined(NANA_WINDOWS)
+
 #include <shellapi.h>
 #include <stdexcept>
 
@@ -290,3 +293,5 @@ namespace detail
 	}
 }//end namespace detail
 }//end namespace nana
+
+#endif //NANA_WINDOWS