mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove marco PLATFORM_SPEC_HPP

Browse Source
This commit is contained in:
Jinhao 2015-11-08 23:35:38 +08:00
parent e3e861eec8
commit 4f988a2223
20 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/config.hpp
View File

@ -37,7 +37,6 @@
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
//Windows: //Windows:
#define NANA_WINDOWS 1 #define NANA_WINDOWS 1
#define PLATFORM_SPEC_HPP <nana/detail/win32/platform_spec.hpp>
//Test if it is MINGW //Test if it is MINGW
#if defined(__MINGW32__) || defined(__MINGW64__) #if defined(__MINGW32__) || defined(__MINGW64__)
@ -52,7 +51,6 @@
//Linux: //Linux:
#define NANA_LINUX 1 #define NANA_LINUX 1
#define NANA_X11 1 #define NANA_X11 1
#define PLATFORM_SPEC_HPP <nana/detail/linux_X11/platform_spec.hpp>
#define STD_CODECVT_NOT_SUPPORTED #define STD_CODECVT_NOT_SUPPORTED
#else #else
# static_assert(false, "Only Windows and Unix are supported now"); # static_assert(false, "Only Windows and Unix are supported now");

21
include/nana/detail/platform_spec_selector.hpp Normal file
View File

@ -0,0 +1,21 @@
/*
* Selector of Platform Specification
* Nana C++ Library(http://www.nanapro.org)
* 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
* http://www.boost.org/LICENSE_1_0.txt)
*
* @file: nana/detail/platform_spec_selector.hpp
*
* Selects the proper platform_spec header file for the current platform
*/
#include <nana/config.hpp>
#if defined(NANA_WINDOWS)
#include <nana/detail/win32/platform_spec.hpp>
#else
#include <nana/detail/linux_X11/platform_spec.hpp>
#endif

2
include/nana/detail/win32/platform_spec.hpp
View File

@ -1,7 +1,7 @@
/* /*
* Platform Specification Implementation * Platform Specification Implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at

2
source/deploy.cpp
View File

@ -20,7 +20,7 @@
#include <windows.h> #include <windows.h>
#elif defined(NANA_LINUX) #elif defined(NANA_LINUX)
#include <string.h> #include <string.h>
#include PLATFORM_SPEC_HPP #include <nana/detail/platform_spec_selector.hpp>
#endif #endif
//Implement workarounds for GCC/MinGW which version is below 4.8.2 //Implement workarounds for GCC/MinGW which version is below 4.8.2

4
source/detail/linux_X11/platform_spec.cpp
View File

@ -13,9 +13,7 @@
* *
* http://standards.freedesktop.org/clipboards-spec/clipboards-0.1.txt * http://standards.freedesktop.org/clipboards-spec/clipboards-0.1.txt
*/ */
#include <nana/config.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include PLATFORM_SPEC_HPP
#include <X11/Xlocale.h> #include <X11/Xlocale.h>
#include <locale> #include <locale>
#include <map> #include <map>

4
source/detail/win32/platform_spec.cpp
View File

@ -11,9 +11,7 @@
* *
* This file provides basis class and data structrue that required by nana * This file provides basis class and data structrue that required by nana
*/ */
#include <nana/config.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include PLATFORM_SPEC_HPP
#include <shellapi.h> #include <shellapi.h>
#include <stdexcept> #include <stdexcept>

3
source/gui/detail/bedrock_pi.cpp
View File

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

3
source/gui/detail/linux_X11/bedrock.cpp
View File

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

3
source/gui/detail/native_window_interface.cpp
View File

@ -10,8 +10,7 @@
* @file: nana/gui/detail/native_window_interface.cpp * @file: nana/gui/detail/native_window_interface.cpp
*/ */
#include <nana/config.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include PLATFORM_SPEC_HPP
#include <nana/gui/detail/native_window_interface.hpp> #include <nana/gui/detail/native_window_interface.hpp>
#include <nana/gui/screen.hpp> #include <nana/gui/screen.hpp>
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)

4
source/gui/detail/win32/bedrock.cpp
View File

@ -11,9 +11,7 @@
* @contributors: Ariel Vina-Rodriguez * @contributors: Ariel Vina-Rodriguez
*/ */
#include <nana/config.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include PLATFORM_SPEC_HPP
#include <nana/gui/detail/bedrock.hpp> #include <nana/gui/detail/bedrock.hpp>
#include <nana/gui/detail/bedrock_pi_data.hpp> #include <nana/gui/detail/bedrock_pi_data.hpp>
#include <nana/gui/detail/event_code.hpp> #include <nana/gui/detail/event_code.hpp>

7
source/gui/notifier.cpp
View File

@ -24,10 +24,9 @@
#include <mutex> #include <mutex>
#endif #endif
#if defined(NANA_WINDOWS) #include <nana/detail/platform_spec_selector.hpp>
#include <nana/detail/win32/platform_spec.hpp>
#elif defined(NANA_LINUX) #if defined(NANA_LINUX)
#include PLATFORM_SPEC_HPP
#include <nana/system/platform.hpp> #include <nana/system/platform.hpp>
#include <iostream> #include <iostream>
#endif #endif

2
source/gui/timer.cpp
View File

@ -27,7 +27,7 @@
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
#include <windows.h> #include <windows.h>
#elif defined(NANA_LINUX) #elif defined(NANA_LINUX)
#include PLATFORM_SPEC_HPP #include <nana/detail/platform_spec_selector.hpp>
#include <nana/system/platform.hpp> #include <nana/system/platform.hpp>
#endif #endif

1
source/gui/widgets/listbox.cpp
View File

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

3
source/paint/detail/native_paint_interface.cpp
View File

@ -11,8 +11,7 @@
* @contributors: dareg * @contributors: dareg
*/ */
#include <nana/config.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include PLATFORM_SPEC_HPP
#include <nana/paint/detail/native_paint_interface.hpp> #include <nana/paint/detail/native_paint_interface.hpp>
#include <nana/paint/pixel_buffer.hpp> #include <nana/paint/pixel_buffer.hpp>
#include <nana/gui/layout_utility.hpp> #include <nana/gui/layout_utility.hpp>

3
source/paint/graphics.cpp
View File

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

3
source/paint/image.cpp
View File

@ -10,8 +10,7 @@
* @file: nana/paint/image.cpp * @file: nana/paint/image.cpp
*/ */
#include <nana/config.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include PLATFORM_SPEC_HPP
#include <nana/paint/image.hpp> #include <nana/paint/image.hpp>
#include <algorithm> #include <algorithm>
#include <fstream> #include <fstream>

3
source/paint/pixel_buffer.cpp
View File

@ -11,8 +11,7 @@
* @note: The format of Xorg 16bits depth is 565 * @note: The format of Xorg 16bits depth is 565
*/ */
#include <nana/config.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include PLATFORM_SPEC_HPP
#include <nana/paint/pixel_buffer.hpp> #include <nana/paint/pixel_buffer.hpp>
#include <nana/gui/layout_utility.hpp> #include <nana/gui/layout_utility.hpp>
#include <nana/paint/detail/native_paint_interface.hpp> #include <nana/paint/detail/native_paint_interface.hpp>

3
source/paint/text_renderer.cpp
View File

@ -1,6 +1,5 @@
#include <nana/config.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include PLATFORM_SPEC_HPP
#include <nana/paint/text_renderer.hpp> #include <nana/paint/text_renderer.hpp>
#include <nana/unicode_bidi.hpp> #include <nana/unicode_bidi.hpp>
#include <nana/paint/detail/native_paint_interface.hpp> #include <nana/paint/detail/native_paint_interface.hpp>

4
source/system/dataexch.cpp
View File

@ -1,6 +1,6 @@
/* /*
* Data Exchanger Implementation * 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. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -19,7 +19,7 @@
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
#include <windows.h> #include <windows.h>
#elif defined(NANA_X11) #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/bedrock.hpp>
#include <nana/gui/detail/basic_window.hpp> #include <nana/gui/detail/basic_window.hpp>
#endif #endif

4
source/system/platform.cpp
View File

@ -1,6 +1,6 @@
/* /*
* A platform API implementation * 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. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -14,7 +14,7 @@
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
#include <windows.h> #include <windows.h>
#include PLATFORM_SPEC_HPP #include <nana/detail/win32/platform_spec.hpp>
#elif defined(NANA_LINUX) #elif defined(NANA_LINUX)
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>