remove marco PLATFORM_SPEC_HPP

2015-11-08 23:35:38 +08:00
parent e3e861eec8
commit 4f988a2223
20 changed files with 43 additions and 38 deletions
--- a/source/deploy.cpp
+++ b/source/deploy.cpp
@@ -20,7 +20,7 @@
 	#include <windows.h>
 #elif defined(NANA_LINUX)
 	#include <string.h>
-	#include PLATFORM_SPEC_HPP
+	#include <nana/detail/platform_spec_selector.hpp>
 #endif

 //Implement workarounds for GCC/MinGW which version is below 4.8.2
--- a/source/detail/linux_X11/platform_spec.cpp
+++ b/source/detail/linux_X11/platform_spec.cpp
@@ -13,9 +13,7 @@
 *
 *	http://standards.freedesktop.org/clipboards-spec/clipboards-0.1.txt
 */
-#include <nana/config.hpp>
-
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <X11/Xlocale.h>
 #include <locale>
 #include <map>
--- a/source/detail/win32/platform_spec.cpp
+++ b/source/detail/win32/platform_spec.cpp
@@ -11,9 +11,7 @@
 *
 *	This file provides basis class and data structrue that required by nana
 */
-#include <nana/config.hpp>
-
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <shellapi.h>
 #include <stdexcept>

--- a/source/gui/detail/bedrock_pi.cpp
+++ b/source/gui/detail/bedrock_pi.cpp
@@ -10,8 +10,7 @@
 *	@file: nana/gui/detail/bedrock_pi.cpp
 */

-#include <nana/config.hpp>
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <nana/gui/detail/bedrock_pi_data.hpp>
 #include <nana/gui/detail/event_code.hpp>
 #include <nana/system/platform.hpp>
--- a/source/gui/detail/linux_X11/bedrock.cpp
+++ b/source/gui/detail/linux_X11/bedrock.cpp
@@ -10,8 +10,7 @@
 *	@file: nana/gui/detail/linux_X11/bedrock.cpp
 */

-#include <nana/config.hpp>
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <nana/gui/detail/bedrock_pi_data.hpp>
 #include <nana/gui/detail/event_code.hpp>
 #include <nana/system/platform.hpp>
--- a/source/gui/detail/native_window_interface.cpp
+++ b/source/gui/detail/native_window_interface.cpp
@@ -10,8 +10,7 @@
 *	@file: nana/gui/detail/native_window_interface.cpp
 */

-#include <nana/config.hpp>
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <nana/gui/detail/native_window_interface.hpp>
 #include <nana/gui/screen.hpp>
 #if defined(NANA_WINDOWS)
--- a/source/gui/detail/win32/bedrock.cpp
+++ b/source/gui/detail/win32/bedrock.cpp
@@ -11,9 +11,7 @@
 *	@contributors: Ariel Vina-Rodriguez
 */

-#include <nana/config.hpp>
-
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <nana/gui/detail/bedrock.hpp>
 #include <nana/gui/detail/bedrock_pi_data.hpp>
 #include <nana/gui/detail/event_code.hpp>
--- a/source/gui/notifier.cpp
+++ b/source/gui/notifier.cpp
@@ -24,10 +24,9 @@
 #include <mutex>
 #endif

-#if defined(NANA_WINDOWS)
-#include <nana/detail/win32/platform_spec.hpp>
-#elif defined(NANA_LINUX)
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
+
+#if defined(NANA_LINUX)
 #include <nana/system/platform.hpp>
 #include <iostream>
 #endif
--- a/source/gui/timer.cpp
+++ b/source/gui/timer.cpp
@@ -27,7 +27,7 @@
 #if defined(NANA_WINDOWS)
 #include <windows.h>
 #elif defined(NANA_LINUX)
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <nana/system/platform.hpp>
 #endif

--- a/source/gui/widgets/listbox.cpp
+++ b/source/gui/widgets/listbox.cpp
@@ -9,6 +9,7 @@
 *
 *	@file: nana/gui/widgets/listbox.cpp
 *	@contributors:	Hiroshi Seki, Ariel Vina-Rodriguez
+ *					leobackes(pr #86)
 */

 #include <nana/gui/widgets/listbox.hpp>
--- a/source/paint/detail/native_paint_interface.cpp
+++ b/source/paint/detail/native_paint_interface.cpp
@@ -11,8 +11,7 @@
 *	@contributors:	dareg
 */

-#include <nana/config.hpp>
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <nana/paint/detail/native_paint_interface.hpp>
 #include <nana/paint/pixel_buffer.hpp>
 #include <nana/gui/layout_utility.hpp>
--- a/source/paint/graphics.cpp
+++ b/source/paint/graphics.cpp
@@ -10,8 +10,7 @@
 *	@file: nana/paint/graphics.cpp
 */

-#include <nana/config.hpp>
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <nana/gui/detail/bedrock.hpp>
 #include <nana/paint/graphics.hpp>
 #include <nana/paint/detail/native_paint_interface.hpp>
--- a/source/paint/image.cpp
+++ b/source/paint/image.cpp
@@ -10,8 +10,7 @@
 *	@file: nana/paint/image.cpp
 */

-#include <nana/config.hpp>
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <nana/paint/image.hpp>
 #include <algorithm>
 #include <fstream>
--- a/source/paint/pixel_buffer.cpp
+++ b/source/paint/pixel_buffer.cpp
@@ -11,8 +11,7 @@
 *	@note: The format of Xorg 16bits depth is 565
 */

-#include <nana/config.hpp>
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <nana/paint/pixel_buffer.hpp>
 #include <nana/gui/layout_utility.hpp>
 #include <nana/paint/detail/native_paint_interface.hpp>
--- a/source/paint/text_renderer.cpp
+++ b/source/paint/text_renderer.cpp
@@ -1,6 +1,5 @@

-#include <nana/config.hpp>
-#include PLATFORM_SPEC_HPP
+#include <nana/detail/platform_spec_selector.hpp>
 #include <nana/paint/text_renderer.hpp>
 #include <nana/unicode_bidi.hpp>
 #include <nana/paint/detail/native_paint_interface.hpp>
--- a/source/system/dataexch.cpp
+++ b/source/system/dataexch.cpp
@@ -1,6 +1,6 @@
 /*
 *	Data Exchanger Implementation
- *	Copyright(C) 2003-2013 Jinhao(cnjinhao@hotmail.com)
+ *	Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
 *
 *	Distributed under the Boost Software License, Version 1.0.
 *	(See accompanying file LICENSE_1_0.txt or copy at
@@ -19,7 +19,7 @@
 #if defined(NANA_WINDOWS)
 	#include <windows.h>
 #elif defined(NANA_X11)
-	#include PLATFORM_SPEC_HPP
+	#include <nana/detail/platform_spec_selector.hpp>
 	#include <nana/gui/detail/bedrock.hpp>
 	#include <nana/gui/detail/basic_window.hpp>
 #endif
--- a/source/system/platform.cpp
+++ b/source/system/platform.cpp
@@ -1,6 +1,6 @@
 /*
 *	A platform API implementation
- *	Copyright(C) 2003-2013 Jinhao(cnjinhao@hotmail.com)
+ *	Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
 *
 *	Distributed under the Boost Software License, Version 1.0.
 *	(See accompanying file LICENSE_1_0.txt or copy at
@@ -14,7 +14,7 @@

 #if defined(NANA_WINDOWS)
 	#include <windows.h>
-	#include PLATFORM_SPEC_HPP
+	#include <nana/detail/win32/platform_spec.hpp>
 #elif defined(NANA_LINUX)
 	#include <time.h>
 	#include <errno.h>