diff --git a/build/vc2013/nana.vcxproj b/build/vc2013/nana.vcxproj
index 9547b689..9cdc46b0 100644
--- a/build/vc2013/nana.vcxproj
+++ b/build/vc2013/nana.vcxproj
@@ -67,24 +67,32 @@
- ../bin/vc2013/
+ ../bin/
..\..\include;$(IncludePath)
..\..\source;$(VC_SourcePath);
+ $(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
..\..\include;$(IncludePath)
..\..\source;$(VC_SourcePath);
- ../bin/vc2013/
+ ../bin/
+ $(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
- ../bin/vc2013/
+ ../bin/
..\..\include;$(IncludePath)
..\..\source;$(VC_SourcePath);
+ $(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
..\..\include;$(IncludePath)
..\..\source;$(VC_SourcePath);
- ../bin/vc2013/
+ ../bin/
+ $(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
@@ -102,7 +110,7 @@
true
- $(OutDir)\nana_$(ConfigurationName)_$(PlatformShortName).lib
+ $(TargetPath)
@@ -119,7 +127,7 @@
true
- $(OutDir)\nana_$(ConfigurationName)_$(PlatformShortName).lib
+ $(TargetPath)
@@ -141,7 +149,7 @@
true
- $(OutDir)\nana_$(ConfigurationName)_$(PlatformShortName).lib
+ $(TargetPath)
@@ -162,7 +170,7 @@
true
- $(OutDir)\nana_$(ConfigurationName)_$(PlatformShortName).lib
+ $(TargetPath)
diff --git a/build/vc2013/nana.vcxproj.filters b/build/vc2013/nana.vcxproj.filters
index cb51dab8..ac073316 100644
--- a/build/vc2013/nana.vcxproj.filters
+++ b/build/vc2013/nana.vcxproj.filters
@@ -309,4 +309,9 @@
Header Files
+
+
+ Header Files
+
+
\ No newline at end of file
diff --git a/build/vc2015/nana.sln b/build/vc2015/nana.sln
new file mode 100644
index 00000000..eab31ab5
--- /dev/null
+++ b/build/vc2015/nana.sln
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.22823.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nana", "nana.vcxproj", "{25B21068-491B-4A9F-B99F-6C27BF31BAAD}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x64.ActiveCfg = Debug|x64
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x64.Build.0 = Debug|x64
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x86.ActiveCfg = Debug|Win32
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x86.Build.0 = Debug|Win32
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x64.ActiveCfg = Release|x64
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x64.Build.0 = Release|x64
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x86.ActiveCfg = Release|Win32
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x86.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/build/vc2015/nana.vcxproj b/build/vc2015/nana.vcxproj
new file mode 100644
index 00000000..94b72562
--- /dev/null
+++ b/build/vc2015/nana.vcxproj
@@ -0,0 +1,266 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}
+ Win32Proj
+ nana
+ 8.1
+
+
+
+ StaticLibrary
+ true
+ v140
+ Unicode
+
+
+ StaticLibrary
+ true
+ v140
+ Unicode
+
+
+ StaticLibrary
+ false
+ v140
+ true
+ Unicode
+
+
+ StaticLibrary
+ false
+ v140
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../bin/
+ ..\..\include;$(IncludePath)
+ ..\..\source;$(VC_SourcePath);
+ $(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
+
+
+ ..\..\include;$(IncludePath)
+ ..\..\source;$(VC_SourcePath);
+ ../bin/
+ $(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
+
+
+ ../bin/
+ ..\..\include;$(IncludePath)
+ ..\..\source;$(VC_SourcePath);
+ $(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
+
+
+ ..\..\include;$(IncludePath)
+ ..\..\source;$(VC_SourcePath);
+ ../bin/
+ $(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+ true
+ false
+
+
+ Windows
+ true
+
+
+ $(TargetPath)
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+
+
+ Windows
+ true
+
+
+ $(TargetPath)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
+ true
+
+
+ Windows
+ true
+ true
+ true
+
+
+ $(TargetPath)
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
+
+
+ Windows
+ true
+ true
+ true
+
+
+ $(TargetPath)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/vc2015/nana.vcxproj.filters b/build/vc2015/nana.vcxproj.filters
new file mode 100644
index 00000000..cb51dab8
--- /dev/null
+++ b/build/vc2015/nana.vcxproj.filters
@@ -0,0 +1,312 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+ {b0bd11b1-bcbb-4e05-885e-44295bc1a7bb}
+
+
+ {aab16aa3-c8d4-4495-8606-1b21ae739ee5}
+
+
+ {c395f107-7102-415b-a019-54e7cf3575af}
+
+
+ {e2569be2-9e68-477d-8b59-e248595de6c7}
+
+
+ {52ed7f8e-fa48-495e-af1f-4df013205a35}
+
+
+ {87d14798-9015-4162-b9ab-72c741cff063}
+
+
+ {4f8e7d23-9fe1-4409-bb03-2bd0809e606b}
+
+
+ {85c9c1bb-d87b-4481-bf3c-7425f680a12d}
+
+
+ {8058b530-86ec-4d72-890d-345aa30db056}
+
+
+ {87b124cb-408d-460b-a81b-8a788bbae0d9}
+
+
+ {b10db2f1-0542-421a-9e1d-4357e3be5f68}
+
+
+ {59f186c8-f5f8-4499-8e19-f278d4754220}
+
+
+ {5acf1733-47b2-4872-a105-66c7ad15cd39}
+
+
+ {a81fa10e-1274-44e0-92a0-434fa28f89ae}
+
+
+ {e95b4a72-643f-4416-af95-b0bbaf7f0c57}
+
+
+
+
+ Source Files\nana\audio\detail
+
+
+ Source Files\nana\audio\detail
+
+
+ Source Files\nana\audio\detail
+
+
+ Source Files\nana\audio
+
+
+ Source Files\nana\detail\win32
+
+
+ Source Files\nana\filesystem
+
+
+ Source Files\nana\filesystem
+
+
+ Source Files\nana\gui\detail\win32
+
+
+ Source Files\nana\gui\detail
+
+
+ Source Files\nana\gui\detail
+
+
+ Source Files\nana\gui\detail
+
+
+ Source Files\nana\gui\detail
+
+
+ Source Files\nana\gui\widgets\skeletons
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\paint\detail
+
+
+ Source Files\nana\paint\detail
+
+
+ Source Files\nana\paint
+
+
+ Source Files\nana\paint
+
+
+ Source Files\nana\paint
+
+
+ Source Files\nana\paint
+
+
+ Source Files\nana\paint
+
+
+ Source Files\nana\paint
+
+
+ Source Files\nana\system
+
+
+ Source Files\nana\system
+
+
+ Source Files\nana\system
+
+
+ Source Files\nana\system
+
+
+ Source Files\nana\threads
+
+
+ Source Files\nana
+
+
+ Source Files\nana
+
+
+ Source Files\nana
+
+
+ Source Files\nana
+
+
+ Source Files\nana
+
+
+ Source Files\nana
+
+
+ Source Files\nana
+
+
+ Source Files\nana
+
+
+ Source Files\nana\gui\detail
+
+
+ Source Files\nana\gui\detail
+
+
+ Source Files\nana\gui\detail
+
+
+ Source Files\nana\gui\detail
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana
+
+
+ Source Files\nana\gui\detail
+
+
+ Source Files\nana\gui
+
+
+ Source Files\nana\gui\widgets
+
+
+ Source Files\nana\filesystem
+
+
+
+
+ Header Files
+
+
+
\ No newline at end of file
diff --git a/include/nana/config.hpp b/include/nana/config.hpp
index 58d1ffad..6d2cf836 100644
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -18,6 +18,7 @@
#define _SCL_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning(disable : 4996)
+
#if (_MSC_VER < 1900)
// is this a good idea?
#define NOT_IMPLEMENTED_KEYWORD_noexcept