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

remove platform_spec_selector.cpp and bedrock_selector.cpp

Browse Source
This commit is contained in:
Jinhao 2015-12-05 15:52:31 +08:00
parent 3863a0dc60
commit dce320d544
15 changed files with 49 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/codeblocks/nana.cbp
View File

@ -49,14 +49,16 @@
<Unit filename="../../source/charset.cpp" /> <Unit filename="../../source/charset.cpp" />
<Unit filename="../../source/datetime.cpp" /> <Unit filename="../../source/datetime.cpp" />
<Unit filename="../../source/deploy.cpp" /> <Unit filename="../../source/deploy.cpp" />
<Unit filename="../../source/detail/platform_spec_selector.cpp" /> <Unit filename="../../source/detail/platform_spec_posix.cpp" />
<Unit filename="../../source/detail/platform_spec_windows.cpp" />
<Unit filename="../../source/filesystem/file_iterator.cpp" /> <Unit filename="../../source/filesystem/file_iterator.cpp" />
<Unit filename="../../source/filesystem/fs_utility.cpp" /> <Unit filename="../../source/filesystem/fs_utility.cpp" />
<Unit filename="../../source/gui/animation.cpp" /> <Unit filename="../../source/gui/animation.cpp" />
<Unit filename="../../source/gui/basis.cpp" /> <Unit filename="../../source/gui/basis.cpp" />
<Unit filename="../../source/gui/detail/basic_window.cpp" /> <Unit filename="../../source/gui/detail/basic_window.cpp" />
<Unit filename="../../source/gui/detail/bedrock_pi.cpp" /> <Unit filename="../../source/gui/detail/bedrock_pi.cpp" />
<Unit filename="../../source/gui/detail/bedrock_selector.cpp" /> <Unit filename="../../source/gui/detail/bedrock_posix.cpp" />
<Unit filename="../../source/gui/detail/bedrock_windows.cpp" />
<Unit filename="../../source/gui/detail/color_schemes.cpp" /> <Unit filename="../../source/gui/detail/color_schemes.cpp" />
<Unit filename="../../source/gui/detail/drawer.cpp" /> <Unit filename="../../source/gui/detail/drawer.cpp" />
<Unit filename="../../source/gui/detail/element_store.cpp" /> <Unit filename="../../source/gui/detail/element_store.cpp" />

4
build/vc2013/nana.vcxproj
View File

@ -187,7 +187,7 @@
<ClCompile Include="..\..\source\charset.cpp" /> <ClCompile Include="..\..\source\charset.cpp" />
<ClCompile Include="..\..\source\datetime.cpp" /> <ClCompile Include="..\..\source\datetime.cpp" />
<ClCompile Include="..\..\source\deploy.cpp" /> <ClCompile Include="..\..\source\deploy.cpp" />
<ClCompile Include="..\..\source\detail\win32\platform_spec.cpp" /> <ClCompile Include="..\..\source\detail\platform_spec_windows.cpp" />
<ClCompile Include="..\..\source\filesystem\filesystem.cpp" /> <ClCompile Include="..\..\source\filesystem\filesystem.cpp" />
<ClCompile Include="..\..\source\filesystem\file_iterator.cpp" /> <ClCompile Include="..\..\source\filesystem\file_iterator.cpp" />
<ClCompile Include="..\..\source\filesystem\fs_utility.cpp" /> <ClCompile Include="..\..\source\filesystem\fs_utility.cpp" />
@ -195,12 +195,12 @@
<ClCompile Include="..\..\source\gui\basis.cpp" /> <ClCompile Include="..\..\source\gui\basis.cpp" />
<ClCompile Include="..\..\source\gui\detail\basic_window.cpp" /> <ClCompile Include="..\..\source\gui\detail\basic_window.cpp" />
<ClCompile Include="..\..\source\gui\detail\bedrock_pi.cpp" /> <ClCompile Include="..\..\source\gui\detail\bedrock_pi.cpp" />
<ClCompile Include="..\..\source\gui\detail\bedrock_windows.cpp" />
<ClCompile Include="..\..\source\gui\detail\color_schemes.cpp" /> <ClCompile Include="..\..\source\gui\detail\color_schemes.cpp" />
<ClCompile Include="..\..\source\gui\detail\drawer.cpp" /> <ClCompile Include="..\..\source\gui\detail\drawer.cpp" />
<ClCompile Include="..\..\source\gui\detail\element_store.cpp" /> <ClCompile Include="..\..\source\gui\detail\element_store.cpp" />
<ClCompile Include="..\..\source\gui\detail\events_operation.cpp" /> <ClCompile Include="..\..\source\gui\detail\events_operation.cpp" />
<ClCompile Include="..\..\source\gui\detail\native_window_interface.cpp" /> <ClCompile Include="..\..\source\gui\detail\native_window_interface.cpp" />
<ClCompile Include="..\..\source\gui\detail\win32\bedrock.cpp" />
<ClCompile Include="..\..\source\gui\detail\window_layout.cpp" /> <ClCompile Include="..\..\source\gui\detail\window_layout.cpp" />
<ClCompile Include="..\..\source\gui\detail\window_manager.cpp" /> <ClCompile Include="..\..\source\gui\detail\window_manager.cpp" />
<ClCompile Include="..\..\source\gui\dragger.cpp" /> <ClCompile Include="..\..\source\gui\dragger.cpp" />

18
build/vc2013/nana.vcxproj.filters
View File

@ -25,9 +25,6 @@
<Filter Include="Source Files\nana\detail"> <Filter Include="Source Files\nana\detail">
<UniqueIdentifier>{e2569be2-9e68-477d-8b59-e248595de6c7}</UniqueIdentifier> <UniqueIdentifier>{e2569be2-9e68-477d-8b59-e248595de6c7}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\nana\detail\win32">
<UniqueIdentifier>{52ed7f8e-fa48-495e-af1f-4df013205a35}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\nana\filesystem"> <Filter Include="Source Files\nana\filesystem">
<UniqueIdentifier>{87d14798-9015-4162-b9ab-72c741cff063}</UniqueIdentifier> <UniqueIdentifier>{87d14798-9015-4162-b9ab-72c741cff063}</UniqueIdentifier>
</Filter> </Filter>
@ -37,9 +34,6 @@
<Filter Include="Source Files\nana\gui\detail"> <Filter Include="Source Files\nana\gui\detail">
<UniqueIdentifier>{85c9c1bb-d87b-4481-bf3c-7425f680a12d}</UniqueIdentifier> <UniqueIdentifier>{85c9c1bb-d87b-4481-bf3c-7425f680a12d}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\nana\gui\detail\win32">
<UniqueIdentifier>{8058b530-86ec-4d72-890d-345aa30db056}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\nana\gui\widgets"> <Filter Include="Source Files\nana\gui\widgets">
<UniqueIdentifier>{87b124cb-408d-460b-a81b-8a788bbae0d9}</UniqueIdentifier> <UniqueIdentifier>{87b124cb-408d-460b-a81b-8a788bbae0d9}</UniqueIdentifier>
</Filter> </Filter>
@ -114,9 +108,6 @@
<ClCompile Include="..\..\source\audio\player.cpp"> <ClCompile Include="..\..\source\audio\player.cpp">
<Filter>Source Files\nana\audio</Filter> <Filter>Source Files\nana\audio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\detail\win32\platform_spec.cpp">
<Filter>Source Files\nana\detail\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\source\filesystem\filesystem.cpp"> <ClCompile Include="..\..\source\filesystem\filesystem.cpp">
<Filter>Source Files\nana\filesystem</Filter> <Filter>Source Files\nana\filesystem</Filter>
</ClCompile> </ClCompile>
@ -126,9 +117,6 @@
<ClCompile Include="..\..\source\filesystem\fs_utility.cpp"> <ClCompile Include="..\..\source\filesystem\fs_utility.cpp">
<Filter>Source Files\nana\filesystem</Filter> <Filter>Source Files\nana\filesystem</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\gui\detail\win32\bedrock.cpp">
<Filter>Source Files\nana\gui\detail\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\source\gui\detail\basic_window.cpp"> <ClCompile Include="..\..\source\gui\detail\basic_window.cpp">
<Filter>Source Files\nana\gui\detail</Filter> <Filter>Source Files\nana\gui\detail</Filter>
</ClCompile> </ClCompile>
@ -339,6 +327,12 @@
<ClCompile Include="..\..\source\gui\widgets\spinbox.cpp"> <ClCompile Include="..\..\source\gui\widgets\spinbox.cpp">
<Filter>Source Files\nana\gui\widgets</Filter> <Filter>Source Files\nana\gui\widgets</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\detail\platform_spec_windows.cpp">
<Filter>Source Files\nana\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\source\gui\detail\bedrock_windows.cpp">
<Filter>Source Files\nana\gui\detail</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\source\gui\widgets\group.cpp"> <ClCompile Include="..\..\source\gui\widgets\group.cpp">

18
build/vc2015/nana.sln
View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.23107.0 VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nana", "nana.vcxproj", "{98091380-2EC4-44B4-82A2-F0A6393BA908}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nana", "nana.vcxproj", "{25B21068-491B-4A9F-B99F-6C27BF31BAAD}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -13,14 +13,14 @@ Global
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x64.ActiveCfg = Debug|x64 {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x64.ActiveCfg = Debug|x64
{98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x64.Build.0 = Debug|x64 {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x64.Build.0 = Debug|x64
{98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x86.ActiveCfg = Debug|Win32 {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x86.ActiveCfg = Debug|Win32
{98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x86.Build.0 = Debug|Win32 {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x86.Build.0 = Debug|Win32
{98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x64.ActiveCfg = Release|x64 {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x64.ActiveCfg = Release|x64
{98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x64.Build.0 = Release|x64 {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x64.Build.0 = Release|x64
{98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x86.ActiveCfg = Release|Win32 {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x86.ActiveCfg = Release|Win32
{98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x86.Build.0 = Release|Win32 {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x86.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

4
build/vc2015/nana.vcxproj
View File

@ -181,7 +181,7 @@
<ClCompile Include="..\..\source\charset.cpp" /> <ClCompile Include="..\..\source\charset.cpp" />
<ClCompile Include="..\..\source\datetime.cpp" /> <ClCompile Include="..\..\source\datetime.cpp" />
<ClCompile Include="..\..\source\deploy.cpp" /> <ClCompile Include="..\..\source\deploy.cpp" />
<ClCompile Include="..\..\source\detail\win32\platform_spec.cpp" /> <ClCompile Include="..\..\source\detail\platform_spec_windows.cpp" />
<ClCompile Include="..\..\source\filesystem\filesystem.cpp" /> <ClCompile Include="..\..\source\filesystem\filesystem.cpp" />
<ClCompile Include="..\..\source\filesystem\file_iterator.cpp" /> <ClCompile Include="..\..\source\filesystem\file_iterator.cpp" />
<ClCompile Include="..\..\source\filesystem\fs_utility.cpp" /> <ClCompile Include="..\..\source\filesystem\fs_utility.cpp" />
@ -189,12 +189,12 @@
<ClCompile Include="..\..\source\gui\basis.cpp" /> <ClCompile Include="..\..\source\gui\basis.cpp" />
<ClCompile Include="..\..\source\gui\detail\basic_window.cpp" /> <ClCompile Include="..\..\source\gui\detail\basic_window.cpp" />
<ClCompile Include="..\..\source\gui\detail\bedrock_pi.cpp" /> <ClCompile Include="..\..\source\gui\detail\bedrock_pi.cpp" />
<ClCompile Include="..\..\source\gui\detail\bedrock_windows.cpp" />
<ClCompile Include="..\..\source\gui\detail\color_schemes.cpp" /> <ClCompile Include="..\..\source\gui\detail\color_schemes.cpp" />
<ClCompile Include="..\..\source\gui\detail\drawer.cpp" /> <ClCompile Include="..\..\source\gui\detail\drawer.cpp" />
<ClCompile Include="..\..\source\gui\detail\element_store.cpp" /> <ClCompile Include="..\..\source\gui\detail\element_store.cpp" />
<ClCompile Include="..\..\source\gui\detail\events_operation.cpp" /> <ClCompile Include="..\..\source\gui\detail\events_operation.cpp" />
<ClCompile Include="..\..\source\gui\detail\native_window_interface.cpp" /> <ClCompile Include="..\..\source\gui\detail\native_window_interface.cpp" />
<ClCompile Include="..\..\source\gui\detail\win32\bedrock.cpp" />
<ClCompile Include="..\..\source\gui\detail\window_layout.cpp" /> <ClCompile Include="..\..\source\gui\detail\window_layout.cpp" />
<ClCompile Include="..\..\source\gui\detail\window_manager.cpp" /> <ClCompile Include="..\..\source\gui\detail\window_manager.cpp" />
<ClCompile Include="..\..\source\gui\dragger.cpp" /> <ClCompile Include="..\..\source\gui\dragger.cpp" />

18
build/vc2015/nana.vcxproj.filters
View File

@ -37,18 +37,12 @@
<Filter Include="Source Files\audio\detail"> <Filter Include="Source Files\audio\detail">
<UniqueIdentifier>{b3023f5e-2759-409d-b6e8-5ef2fe6601ae}</UniqueIdentifier> <UniqueIdentifier>{b3023f5e-2759-409d-b6e8-5ef2fe6601ae}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\detail\win32">
<UniqueIdentifier>{2ce139f3-ef8e-48b7-a82a-68003eac75da}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\gui\detail"> <Filter Include="Source Files\gui\detail">
<UniqueIdentifier>{b9f9a5a8-fd1a-4b99-b530-d8a4c45e62ec}</UniqueIdentifier> <UniqueIdentifier>{b9f9a5a8-fd1a-4b99-b530-d8a4c45e62ec}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\gui\widgets"> <Filter Include="Source Files\gui\widgets">
<UniqueIdentifier>{4b04c197-4a1e-41f9-bfa3-d82c18bcad51}</UniqueIdentifier> <UniqueIdentifier>{4b04c197-4a1e-41f9-bfa3-d82c18bcad51}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\gui\detail\win32">
<UniqueIdentifier>{cd6e7f3f-fe5b-44c6-ae8d-15554f926055}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\gui\widgets\skeletons"> <Filter Include="Source Files\gui\widgets\skeletons">
<UniqueIdentifier>{60f588f2-bdb9-4b1d-9e23-40a73f327283}</UniqueIdentifier> <UniqueIdentifier>{60f588f2-bdb9-4b1d-9e23-40a73f327283}</UniqueIdentifier>
</Filter> </Filter>
@ -93,9 +87,6 @@
<ClCompile Include="..\..\source\audio\player.cpp"> <ClCompile Include="..\..\source\audio\player.cpp">
<Filter>Source Files\audio</Filter> <Filter>Source Files\audio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\detail\win32\platform_spec.cpp">
<Filter>Source Files\detail\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\source\filesystem\file_iterator.cpp"> <ClCompile Include="..\..\source\filesystem\file_iterator.cpp">
<Filter>Source Files\filesystem</Filter> <Filter>Source Files\filesystem</Filter>
</ClCompile> </ClCompile>
@ -132,9 +123,6 @@
<ClCompile Include="..\..\source\gui\detail\window_manager.cpp"> <ClCompile Include="..\..\source\gui\detail\window_manager.cpp">
<Filter>Source Files\gui\detail</Filter> <Filter>Source Files\gui\detail</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\gui\detail\win32\bedrock.cpp">
<Filter>Source Files\gui\detail\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\source\gui\widgets\skeletons\text_editor.cpp"> <ClCompile Include="..\..\source\gui\widgets\skeletons\text_editor.cpp">
<Filter>Source Files\gui\widgets\skeletons</Filter> <Filter>Source Files\gui\widgets\skeletons</Filter>
</ClCompile> </ClCompile>
@ -294,5 +282,11 @@
<ClCompile Include="..\..\source\paint\text_renderer.cpp"> <ClCompile Include="..\..\source\paint\text_renderer.cpp">
<Filter>Source Files\paint</Filter> <Filter>Source Files\paint</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\detail\platform_spec_windows.cpp">
<Filter>Source Files\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\source\gui\detail\bedrock_windows.cpp">
<Filter>Source Files\gui\detail</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

13
include/nana/config.hpp
View File

@ -18,7 +18,7 @@
// Windows: // Windows:
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
#define NANA_WINDOWS 1 #define NANA_WINDOWS
// MINGW ... // MINGW ...
#if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW) #if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW)
@ -31,23 +31,22 @@
// MacOS: who define APPLE ?? // MacOS: who define APPLE ??
//#define APPLE //#define APPLE
#elif defined(APPLE) #elif defined(APPLE)
#define NANA_MACOS 1 #define NANA_MACOS
#define NANA_X11 1 #define NANA_X11
// how to add this: include_directories(/opt/X11/include/) // how to add this: include_directories(/opt/X11/include/)
// end MacOS // end MacOS
// Linux: (not sure about __GNU__ ??) // Linux: (not sure about __GNU__ ??)
#elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC) #elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
#define NANA_LINUX 1 #define NANA_LINUX
#define NANA_X11 1 #define NANA_X11
// end Linux // end Linux
#else #else
# static_assert(false, "Only Windows and Unix are supported now (Mac OS is experimental)"); # static_assert(false, "Only Windows and Unix are supported now (Mac OS is experimental)");
#endif // Select platform #endif // Select platform
#if defined(NANA_LINUX) || defined(NANA_MACOS) #if defined(NANA_LINUX) || defined(NANA_MACOS)
#define NANA_POSIX
#undef NANA_WINDOWS #undef NANA_WINDOWS
#endif #endif
// End Select platform ...... // End Select platform ......

2
include/nana/filesystem/file_iterator.hpp
View File

@ -38,7 +38,7 @@ namespace filesystem
fileinfo(); fileinfo();
#ifdef NANA_WINDOWS #ifdef NANA_WINDOWS
fileinfo(const WIN32_FIND_DATA& wfd); fileinfo(const WIN32_FIND_DATA& wfd);
#elif NANA_LINUX or NANA_MACOS #elif defined(NANA_POSIX)
fileinfo(const nana::string& filename, const struct stat &); fileinfo(const nana::string& filename, const struct stat &);
#endif #endif
nana::string name; nana::string name;

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

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

22
source/detail/platform_spec_selector.cpp
View File

@ -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

5
source/detail/win32/platform_spec.cpp → source/detail/platform_spec_windows.cpp
View File

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

0
source/detail/linux_X11/msg_dispatcher.hpp → source/detail/x11/msg_dispatcher.hpp
View File

2
source/gui/detail/linux_X11/bedrock.cpp → source/gui/detail/bedrock_posix.cpp
View File

@ -11,6 +11,7 @@
*/ */
#include <nana/detail/platform_spec_selector.hpp> #include <nana/detail/platform_spec_selector.hpp>
#if defined(NANA_POSIX) && defined(NANA_X11)
#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>
@ -1399,3 +1400,4 @@ namespace detail
} }
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana
#endif //NANA_POSIX && NANA_X11

23
source/gui/detail/bedrock_selector.cpp
View File

@ -1,23 +0,0 @@
/*
* Bedrock Selector
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2015 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.sourceforge.net/LICENSE_1_0.txt)
*
* @file: nana/gui/detail/bedrock_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/bedrock.cpp"
#elif defined(NANA_LINUX) || defined(NANA_MACOS)
#include "linux_X11/bedrock.cpp"
#endif

2
source/gui/detail/win32/bedrock.cpp → source/gui/detail/bedrock_windows.cpp
View File

@ -12,6 +12,7 @@
*/ */
#include <nana/detail/platform_spec_selector.hpp> #include <nana/detail/platform_spec_selector.hpp>
#if defined(NANA_WINDOWS)
#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>
@ -1894,3 +1895,4 @@ namespace detail
} }
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana
#endif //NANA_WINDOWS