diff --git a/build/codeblocks/nana.cbp b/build/codeblocks/nana.cbp index fb1a1b55..9302ebd6 100644 --- a/build/codeblocks/nana.cbp +++ b/build/codeblocks/nana.cbp @@ -102,7 +102,6 @@ - diff --git a/build/codeblocks/nana.depend b/build/codeblocks/nana.depend index a2318fdf..f7f24eaa 100644 --- a/build/codeblocks/nana.depend +++ b/build/codeblocks/nana.depend @@ -537,3 +537,633 @@ 1399002439 source:d:\privates\nana\release\nana.cpp11\source\gui\detail\element_store.cpp +1363362719 source:d:\git.repo\nana\source\any.cpp + + +1362509572 source:d:\git.repo\nana\source\audio\detail\audio_device.cpp + + + + + + + +1439496157 source:d:\git.repo\nana\source\audio\detail\audio_stream.cpp + + + +1362509721 source:d:\git.repo\nana\source\audio\detail\buffer_preparation.cpp + + + +1353253406 source:d:\git.repo\nana\source\audio\player.cpp + + + + + + +1439496157 source:d:\git.repo\nana\source\basic_types.cpp + + + + + + +1439496157 source:d:\git.repo\nana\source\charset.cpp + + + + + + + + +1439496157 source:d:\git.repo\nana\source\datetime.cpp + + + + + +1439496157 source:d:\git.repo\nana\source\deploy.cpp + + + + + + + +1439496157 source:d:\git.repo\nana\source\detail\platform_spec_selector.cpp + + "win32/platform_spec.cpp" + "linux_X11/platform_spec.cpp" + +1439496157 d:\git.repo\nana\source\detail\win32\platform_spec.cpp + + + + + +1439496157 d:\git.repo\nana\source\detail\linux_x11\platform_spec.cpp + + + + + + + + + + + + + "msg_dispatcher.hpp" + +1439496157 d:\git.repo\nana\source\detail\linux_x11\msg_dispatcher.hpp + + + + + + + + + + +1365203880 source:d:\git.repo\nana\source\exceptions.cpp + + +1365203878 source:d:\git.repo\nana\source\filesystem\file_iterator.cpp + + +1365203878 source:d:\git.repo\nana\source\filesystem\fs_utility.cpp + + + + + + + + + + + + + + + + +1439496157 source:d:\git.repo\nana\source\gui\animation.cpp + + + + + + + + + + + + + + +1423350892 source:d:\git.repo\nana\source\gui\basis.cpp + + +1439496157 source:d:\git.repo\nana\source\gui\detail\basic_window.cpp + + + +1439496157 source:d:\git.repo\nana\source\gui\detail\bedrock_pi.cpp + + + + + + + + + + + + + +1439496157 source:d:\git.repo\nana\source\gui\detail\bedrock_selector.cpp + + "win32/bedrock.cpp" + "linux_X11/bedrock.cpp" + +1439496157 d:\git.repo\nana\source\gui\detail\win32\bedrock.cpp + + + + + + + + + + + + + + +1439496157 d:\git.repo\nana\source\gui\detail\linux_x11\bedrock.cpp + + + + + + + + + + +1423350892 source:d:\git.repo\nana\source\gui\detail\color_schemes.cpp + + + +1439496157 source:d:\git.repo\nana\source\gui\detail\drawer.cpp + + + + + + + + +1408986718 source:d:\git.repo\nana\source\gui\detail\element_store.cpp + + +1439496157 source:d:\git.repo\nana\source\gui\detail\events_operation.cpp + + +1439828940 source:d:\git.repo\nana\source\gui\detail\native_window_interface.cpp + + + + + + + "../../paint/detail/image_ico.hpp" + + + +1439496158 d:\git.repo\nana\source\paint\detail\image_ico.hpp + + +1439496157 source:d:\git.repo\nana\source\gui\detail\window_layout.cpp + + + + + + +1439496157 source:d:\git.repo\nana\source\gui\detail\window_manager.cpp + + + + + + + + + + + +1439746409 source:d:\git.repo\nana\source\gui\dragger.cpp + + +1423350892 source:d:\git.repo\nana\source\gui\drawing.cpp + + + + +1439496157 source:d:\git.repo\nana\source\gui\effects.cpp + + + +1439829040 source:d:\git.repo\nana\source\gui\element.cpp + + + + + + + + + +1439496157 source:d:\git.repo\nana\source\gui\filebox.cpp + + + + + + + + + + + + + + + + +1439496157 source:d:\git.repo\nana\source\gui\layout_utility.cpp + + +1439496157 source:d:\git.repo\nana\source\gui\msgbox.cpp + + + + + + + + + + + + + + + + + + +1439496157 source:d:\git.repo\nana\source\gui\notifier.cpp + + + + + + + + + + + + +1439746410 source:d:\git.repo\nana\source\gui\programming_interface.cpp + + + + + + +1439496158 source:d:\git.repo\nana\source\gui\screen.cpp + + + + + + + +1415011766 source:d:\git.repo\nana\source\gui\state_cursor.cpp + + + + +1439496158 source:d:\git.repo\nana\source\gui\timer.cpp + + + + + + + + + +1439496158 source:d:\git.repo\nana\source\gui\tooltip.cpp + + + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\button.cpp + + + +1439829040 source:d:\git.repo\nana\source\gui\widgets\categorize.cpp + + + + + + + +1439829040 source:d:\git.repo\nana\source\gui\widgets\checkbox.cpp + + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\combox.cpp + + + + + + + + + +1439829040 source:d:\git.repo\nana\source\gui\widgets\date_chooser.cpp + + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\float_listbox.cpp + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\form.cpp + + +1408985395 source:d:\git.repo\nana\source\gui\widgets\frame.cpp + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\group.cpp + + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\label.cpp + + + + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\listbox.cpp + + + + + + + + + + + + +1439828820 source:d:\git.repo\nana\source\gui\widgets\menu.cpp + + + + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\menubar.cpp + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\panel.cpp + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\picture.cpp + + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\progress.cpp + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\scroll.cpp + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\skeletons\text_editor.cpp + + + + + + + + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\slider.cpp + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\spinbox.cpp + + + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\textbox.cpp + + + + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\toolbar.cpp + + + + +1439496158 source:d:\git.repo\nana\source\gui\widgets\treebox.cpp + + + + + + + +1439746410 source:d:\git.repo\nana\source\gui\widgets\widget.cpp + + + + +1408984042 source:d:\git.repo\nana\source\gui\wvl.cpp + + +1425221155 source:d:\git.repo\nana\source\internationalization.cpp + + + + + + + +1423350893 source:d:\git.repo\nana\source\paint\detail\image_process_provider.cpp + + + +1439496158 source:d:\git.repo\nana\source\paint\detail\native_paint_interface.cpp + + + + + + + +1439746289 source:d:\git.repo\nana\source\paint\graphics.cpp + + + + + + + + + + + +1439496158 source:d:\git.repo\nana\source\paint\image.cpp + + + + + + + + + "detail/image_png.hpp" + "detail/image_bmp.hpp" + "detail/image_ico.hpp" + +1439687843 d:\git.repo\nana\source\paint\detail\image_png.hpp + + + + + + +1439496158 d:\git.repo\nana\source\paint\detail\image_bmp.hpp + + + +1376313789 source:d:\git.repo\nana\source\paint\image_process_selector.cpp + + +1439496158 source:d:\git.repo\nana\source\paint\pixel_buffer.cpp + + + + + + + +1423350893 source:d:\git.repo\nana\source\paint\text_renderer.cpp + + + + + +1439496158 source:d:\git.repo\nana\source\system\dataexch.cpp + + + + + + + + + +1387007333 source:d:\git.repo\nana\source\system\platform.cpp + + + + + + + + +1365203879 source:d:\git.repo\nana\source\system\shared_wrapper.cpp + + + + + + +1342280997 source:d:\git.repo\nana\source\system\timepiece.cpp + + + + + +1386165989 source:d:\git.repo\nana\source\threads\pool.cpp + + + + + + + + + + + + + +1365203748 source:d:\git.repo\nana\source\traits.cpp + + +1439496158 source:d:\git.repo\nana\source\unicode_bidi.cpp + + +1439830958 source:d:\git.repo\nana\source\gui\widgets\tabbar.cpp + + + + + + + + diff --git a/build/codeblocks/nana.layout b/build/codeblocks/nana.layout index 92b352dc..587b86f1 100644 --- a/build/codeblocks/nana.layout +++ b/build/codeblocks/nana.layout @@ -1,24 +1,9 @@ - + - - - - - - - - - - - - - - - - + @@ -26,9 +11,9 @@ - + - + @@ -36,66 +21,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - @@ -126,29 +71,89 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/vc2013/nana.vcxproj b/build/vc2013/nana.vcxproj index 610054bc..7ed1c2f9 100644 --- a/build/vc2013/nana.vcxproj +++ b/build/vc2013/nana.vcxproj @@ -243,7 +243,6 @@ - @@ -277,8 +276,8 @@ - - + + @@ -383,4 +382,4 @@ - + \ No newline at end of file diff --git a/build/vc2013/nana.vcxproj.filters b/build/vc2013/nana.vcxproj.filters index 6ade66c7..e58eb56b 100644 --- a/build/vc2013/nana.vcxproj.filters +++ b/build/vc2013/nana.vcxproj.filters @@ -119,7 +119,7 @@ Source Files\nana\detail\win32 - + Source Files\nana\filesystem @@ -261,9 +261,6 @@ Source Files\nana\paint\detail - - Source Files\nana\paint - Source Files\nana\paint @@ -645,7 +642,7 @@ Header Files\extrlib - + Header Files\filesystem @@ -719,4 +716,4 @@ Header Files\gui\widgets - + \ No newline at end of file diff --git a/build/vc2015/nana.sln b/build/vc2015/nana.sln index eab31ab5..6de06997 100644 --- a/build/vc2015/nana.sln +++ b/build/vc2015/nana.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22823.1 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nana", "nana.vcxproj", "{25B21068-491B-4A9F-B99F-6C27BF31BAAD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nana", "nana.vcxproj", "{98091380-2EC4-44B4-82A2-F0A6393BA908}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,14 +13,14 @@ Global 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 + {98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x64.ActiveCfg = Debug|x64 + {98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x64.Build.0 = Debug|x64 + {98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x86.ActiveCfg = Debug|Win32 + {98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x86.Build.0 = Debug|Win32 + {98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x64.ActiveCfg = Release|x64 + {98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x64.Build.0 = Release|x64 + {98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x86.ActiveCfg = Release|Win32 + {98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/vc2015/nana.vcxproj b/build/vc2015/nana.vcxproj index d4f7f5d3..9b0433bd 100644 --- a/build/vc2015/nana.vcxproj +++ b/build/vc2015/nana.vcxproj @@ -5,24 +5,24 @@ Debug Win32 - - Debug - x64 - Release Win32 + + Debug + x64 + Release x64 - {25B21068-491B-4A9F-B99F-6C27BF31BAAD} + {98091380-2EC4-44B4-82A2-F0A6393BA908} Win32Proj nana - 8.1 + 8.1 @@ -31,12 +31,6 @@ v140 Unicode - - StaticLibrary - true - v140 - Unicode - StaticLibrary false @@ -44,6 +38,12 @@ true Unicode + + StaticLibrary + true + v140 + Unicode + StaticLibrary false @@ -54,46 +54,30 @@ - - + - + - + + + + - - ../bin/ - ..\..\include;$(IncludePath) - ..\..\source;$(VC_SourcePath); - $(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName) - ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\ + + ../../include;$(IncludePath) + ..\bin\vc2015\ + lib$(ProjectName) - ..\..\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)\ + ../../include;$(IncludePath) + ..\bin\vc2015\ + lib$(ProjectName)d @@ -102,17 +86,11 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - true - false Windows true - - $(TargetPath) - @@ -120,15 +98,14 @@ Level3 Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug + _DEBUG;_LIB;%(PreprocessorDefinitions) Windows true - $(TargetPath) + $(OutDir)$(TargetName)$(TargetExt) @@ -140,8 +117,6 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - true Windows @@ -149,9 +124,6 @@ true true - - $(TargetPath) - @@ -161,8 +133,7 @@ MaxSpeed true true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded + NDEBUG;_LIB;%(PreprocessorDefinitions) Windows @@ -171,7 +142,7 @@ true - $(TargetPath) + $(OutDir)$(TargetName)$(TargetExt) @@ -244,7 +215,6 @@ - @@ -252,7 +222,6 @@ - diff --git a/build/vc2015/nana.vcxproj.filters b/build/vc2015/nana.vcxproj.filters index 81495341..42482ba2 100644 --- a/build/vc2015/nana.vcxproj.filters +++ b/build/vc2015/nana.vcxproj.filters @@ -13,298 +13,289 @@ {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} + + {9630500a-5aca-4625-a11b-1ba83a93895c} - - {aab16aa3-c8d4-4495-8606-1b21ae739ee5} + + {d43db913-0472-45f6-889e-b147a7b3eb7e} - - {c395f107-7102-415b-a019-54e7cf3575af} + + {4e91af62-8e45-41d5-8bb9-1deb850de937} - - {e2569be2-9e68-477d-8b59-e248595de6c7} + + {c575e702-d7d3-48d2-a465-30e51ca72f8d} - - {52ed7f8e-fa48-495e-af1f-4df013205a35} + + {e1fbd69a-2a82-419e-854a-0b5dbd0e0237} - - {87d14798-9015-4162-b9ab-72c741cff063} + + {295ba47e-9dc7-4375-82bc-443b767eb87d} - - {4f8e7d23-9fe1-4409-bb03-2bd0809e606b} + + {b0854b25-60fc-47e2-a9df-5e4f2d28065c} - - {85c9c1bb-d87b-4481-bf3c-7425f680a12d} + + {b3023f5e-2759-409d-b6e8-5ef2fe6601ae} - - {8058b530-86ec-4d72-890d-345aa30db056} + + {2ce139f3-ef8e-48b7-a82a-68003eac75da} - - {87b124cb-408d-460b-a81b-8a788bbae0d9} + + {b9f9a5a8-fd1a-4b99-b530-d8a4c45e62ec} - - {b10db2f1-0542-421a-9e1d-4357e3be5f68} + + {4b04c197-4a1e-41f9-bfa3-d82c18bcad51} - - {59f186c8-f5f8-4499-8e19-f278d4754220} + + {cd6e7f3f-fe5b-44c6-ae8d-15554f926055} - - {5acf1733-47b2-4872-a105-66c7ad15cd39} + + {60f588f2-bdb9-4b1d-9e23-40a73f327283} - - {a81fa10e-1274-44e0-92a0-434fa28f89ae} - - - {e95b4a72-643f-4416-af95-b0bbaf7f0c57} + + {53feb93f-2b86-4bf5-b2f3-f60ef1bbbf76} - - 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 - Source Files\nana + Source Files - Source Files\nana + Source Files - Source Files\nana + Source Files - Source Files\nana + Source Files - 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 - Source Files\nana + Source Files - - Source Files\nana\gui\detail + + Source Files - - Source Files\nana\gui + + Source Files - - Source Files\nana\gui\widgets + + Source Files\audio\detail + + + Source Files\audio\detail + + + Source Files\audio\detail + + + Source Files\audio + + + Source Files\detail\win32 + + + Source Files\filesystem - Source Files\nana\filesystem + Source Files\filesystem + + + Source Files\filesystem + + + Source Files\gui\detail + + + Source Files\gui\detail + + + Source Files\gui\detail + + + Source Files\gui\detail + + + Source Files\gui\detail + + + Source Files\gui\detail + + + Source Files\gui\detail + + + Source Files\gui\detail + + + Source Files\gui\detail + + + Source Files\gui\detail\win32 + + + Source Files\gui\widgets\skeletons + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets - Source Files\nana\gui\widgets + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui\widgets + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\gui + + + Source Files\threads + + + Source Files\system + + + Source Files\system + + + Source Files\system + + + Source Files\paint\detail + + + Source Files\paint\detail + + + Source Files\paint + + + Source Files\paint + + + Source Files\paint + + + Source Files\paint + + + Source Files\paint \ No newline at end of file diff --git a/extrlib/readme (2).txt b/extrlib/readme (2).txt deleted file mode 100644 index 84359ae5..00000000 --- a/extrlib/readme (2).txt +++ /dev/null @@ -1 +0,0 @@ -The libpng.a is for MinGW(Not linux), and other .lib files are for VS2013 \ No newline at end of file diff --git a/extrlib/readme.txt b/extrlib/readme.txt index e5edb297..c54ee0ad 100644 --- a/extrlib/readme.txt +++ b/extrlib/readme.txt @@ -1 +1,3 @@ +The libpng.a is for MinGW(Not linux), and other .lib files are for VS2013 + You can download the precompiled external libraries at http://sourceforge.net/projects/nanapro/files/extrlib/ \ No newline at end of file diff --git a/include/nana/gui/widgets/scroll.hpp b/include/nana/gui/widgets/scroll.hpp index 9a0690da..917a5da5 100644 --- a/include/nana/gui/widgets/scroll.hpp +++ b/include/nana/gui/widgets/scroll.hpp @@ -14,7 +14,6 @@ #define NANA_GUI_WIDGET_SCROLL_HPP #include "widget.hpp" -//#include //deprecated #include namespace nana @@ -444,7 +443,7 @@ namespace nana /// @return true if the vlaue is changed. bool make_page_scroll(bool forward) { - return this->make_step(forward, range() - 1); + return this->make_step(forward, static_cast(range() - 1)); } };//end class scroll }//end namespace nana diff --git a/include/nana/gui/widgets/tabbar.hpp b/include/nana/gui/widgets/tabbar.hpp index 69917ca6..02722d96 100644 --- a/include/nana/gui/widgets/tabbar.hpp +++ b/include/nana/gui/widgets/tabbar.hpp @@ -14,7 +14,6 @@ #ifndef NANA_GUI_WIDGET_TABBAR_HPP #define NANA_GUI_WIDGET_TABBAR_HPP #include "widget.hpp" -//#include "../../paint/gadget.hpp" //deprecated #include #include @@ -30,7 +29,7 @@ namespace nana T & value; arg_tabbar(tabbar& wdg, T& v) - : widget{ wdg }, value{ v } + : widget(wdg), value{ v } {} }; diff --git a/include/nana/gui/widgets/treebox.hpp b/include/nana/gui/widgets/treebox.hpp index cd7a6e3e..5e317781 100644 --- a/include/nana/gui/widgets/treebox.hpp +++ b/include/nana/gui/widgets/treebox.hpp @@ -19,7 +19,6 @@ #define NANA_GUI_WIDGETS_TREEBOX_HPP #include "widget.hpp" #include "detail/compset.hpp" -//#include //deprecated #include "detail/tree_cont.hpp" #include #include diff --git a/include/nana/paint/gadget.hpp b/include/nana/paint/gadget.hpp deleted file mode 100644 index d64c9293..00000000 --- a/include/nana/paint/gadget.hpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Graphics Gadget Implementation - * 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/paint/gadget.hpp - */ - -#ifndef NANA_PAINT_GADGET_HPP -#define NANA_PAINT_GADGET_HPP -#include "graphics.hpp" -#include "image.hpp" -#include - -namespace nana -{ -namespace paint -{ -namespace gadget -{ - void close_16_pixels(::nana::paint::graphics&, int x, int y, unsigned style, const color&); - void cross(::nana::paint::graphics&, int x, int y, unsigned size, unsigned thickness, const nana::color&); - -}//end namespace gadget - -}//end namespace paint -}//end namespace nana - -#endif diff --git a/include/nana/pat/cloneable.hpp b/include/nana/pat/cloneable.hpp index 3651743c..16a9dfcd 100644 --- a/include/nana/pat/cloneable.hpp +++ b/include/nana/pat/cloneable.hpp @@ -21,75 +21,6 @@ namespace nana{ namespace pat{ namespace detail { - /* - template - class cloneable_interface //deprecated - { - public: - using interface_t = T; - typedef cloneable_interface cloneable_t; - - virtual ~cloneable_interface() = default; - virtual interface_t& refer() = 0; - virtual const interface_t& refer() const = 0; - virtual cloneable_t* clone() const = 0; - virtual void self_delete() const = 0; - }; - */ - - /* - template - class cloneable_wrapper - : public cloneable_interface //deprecated - { - public: - using value_type = T; - using interface_t = typename cloneable_interface::interface_t; - - cloneable_wrapper() = default; - - cloneable_wrapper(const value_type& obj) - :object_(obj) - {} - - cloneable_wrapper(value_type&& rv) - :object_(std::move(rv)) - {} - - template - cloneable_wrapper(const U& u) - : object_(u) - {} - - template - cloneable_wrapper(U& u) - :object_(u) - {} - - virtual interface_t& refer() override - { - return value_obj_; - } - - virtual const interface_t& refer() const override - { - return value_obj_; - } - - virtual cloneable_interface* clone() const override - { - return (new cloneable_wrapper{ value_obj_ }); - } - - virtual void self_delete() const override - { - (delete this); - } - private: - value_type value_obj_; - }; - */ - class cloneable_interface { public: @@ -124,18 +55,6 @@ namespace nana{ namespace pat{ cloneable_wrapper(value_type&& rv) :value_obj_(std::move(rv)) {} - - /* - template - cloneable_wrapper(const U& u) //deprecated - : object_(u) - {} - - template - cloneable_wrapper(U&& u) - : object_(std::move(u)) - {} - */ private: //Implement cloneable_interface virtual void* get() override diff --git a/source/gui/detail/native_window_interface.cpp b/source/gui/detail/native_window_interface.cpp index d706b43d..6dd9a583 100644 --- a/source/gui/detail/native_window_interface.cpp +++ b/source/gui/detail/native_window_interface.cpp @@ -542,32 +542,6 @@ namespace nana{ return false; } - /* - bool native_interface::window_icon(native_window_type wd, const paint::image& big_icon, const paint::image& small_icon) //deprecated - { -#if defined(NANA_WINDOWS) - HICON h_big_icon = paint::image_accessor::icon(big_icon); - HICON h_small_icon = paint::image_accessor::icon(small_icon); - if (h_big_icon || h_small_icon) - { - nana::detail::platform_spec::instance().keep_window_icon(wd, (!big_icon.empty() ? big_icon : small_icon)); - if (h_big_icon) { - ::SendMessage(reinterpret_cast(wd), WM_SETICON, ICON_BIG, reinterpret_cast(h_big_icon)); - } - if (h_small_icon) { - ::SendMessage(reinterpret_cast(wd), WM_SETICON, ICON_SMALL, reinterpret_cast(h_small_icon)); - } - return true; - } -#elif defined(NANA_X11) - return window_icon(wd, big_icon); -#endif - return false; - } - */ - - - void native_interface::activate_owner(native_window_type wd) { #if defined(NANA_WINDOWS) diff --git a/source/gui/element.cpp b/source/gui/element.cpp index 0263338a..4271a4d2 100644 --- a/source/gui/element.cpp +++ b/source/gui/element.cpp @@ -272,7 +272,7 @@ namespace nana bool draw(graph_reference graph, const ::nana::color& bgcolor, const ::nana::color& fgcolor, const ::nana::rectangle& r, element_state estate, unsigned weight) { graph.rectangle(r, false, static_cast((element_state::focus_hovered == estate || element_state::focus_normal == estate) ? 0x0595E2 : 0x999A9E)); - graph.rectangle(::nana::rectangle{r}.pare_off(1), false, bgcolor); + graph.rectangle(::nana::rectangle(r).pare_off(1), false, bgcolor); return true; } }; @@ -601,8 +601,7 @@ namespace nana : nana::noncopyable, nana::nonmovable { using element_type = ElementInterface; - using factory_interface = pat::cloneable>; //deprecated - //using factory_interface = pat::cloneable; + using factory_interface = pat::cloneable; public: ~element_object() @@ -617,8 +616,7 @@ namespace nana auto keep_e = element_ptr_; factory_ = rhs; - element_ptr_ = factory_->create(); //deprecated - //element_ptr_ = static_cast(static_cast&>(*factory_).create()); + element_ptr_ = static_cast(static_cast&>(*factory_).create()); if(nullptr == factory_ || nullptr == element_ptr_) { @@ -647,14 +645,6 @@ namespace nana class element_manager : nana::noncopyable, nana::nonmovable { - /* - template //deprecated - struct item - { - element_object * employee; - std::map>> table; - }; - */ template struct item { diff --git a/source/gui/msgbox.cpp b/source/gui/msgbox.cpp index c514f124..44addaa6 100644 --- a/source/gui/msgbox.cpp +++ b/source/gui/msgbox.cpp @@ -959,7 +959,7 @@ namespace nana int inputbox::date::month() const { if (!impl_->wdg_month.empty()) - return impl_->wdg_month.option() + 1; + return static_cast(impl_->wdg_month.option()) + 1; return impl_->month; } @@ -1028,7 +1028,7 @@ namespace nana impl->wdg_day.events().destroy.connect_unignorable([impl] { impl->day = impl->wdg_day.to_int(); - impl->month = impl->wdg_month.option() + 1; + impl->month = static_cast(impl->wdg_month.option()) + 1; }); impl->wdg_year.events().destroy.connect_unignorable([impl] @@ -1040,7 +1040,7 @@ namespace nana { auto month = impl->wdg_month.option() + 1; auto year = impl->wdg_year.to_int(); - int days = ::nana::date::month_days(year, month); + int days = ::nana::date::month_days(year, static_cast(month)); auto day = impl->wdg_day.to_int(); impl->wdg_day.range(1, days, 1); //It resets the current value of wdg_day diff --git a/source/gui/place.cpp b/source/gui/place.cpp index 7a6325ef..aa1f02f8 100644 --- a/source/gui/place.cpp +++ b/source/gui/place.cpp @@ -24,6 +24,8 @@ #include #include //numeric_limits +#include //std::abs +#include //std::memset #include "place_parts.hpp" @@ -93,7 +95,13 @@ namespace nana std::string pos_str() const { +#ifdef NANA_MINGW + std::stringstream ss; + ss<(limit_px(_m_leaf_left(), left_px, area_px)); _m_leaf_left()->weight.assign_percent(imd_rate * left_px); @@ -1692,7 +1699,6 @@ namespace nana }); - //indicator_.dock_area->z_order(nullptr, ::nana::z_order_action::top); //deprecated API::bring_top(indicator_.dock_area->handle(), false); indicator_.dock_area->show(); } @@ -2112,7 +2118,6 @@ namespace nana } field_gather * attached_field = nullptr; - field_dock* attached_dock = nullptr; if (name.size()) { //find the field with specified name. @@ -2154,11 +2159,6 @@ namespace nana } break; case token::dock: - //deprecated - // - //if (name.empty()) - // throw std::invalid_argument("nana.place: dock must have a name."); - div.reset(new div_dock(std::move(name), this)); break; default: @@ -2258,7 +2258,7 @@ namespace nana check_fn(div); } - //connect the field/dock with div object, + //connect the field/dock with div object, void place::implement::connect(division* start) { if (!start) @@ -2307,7 +2307,7 @@ namespace nana div->field->attached = div; } } - + } for (auto & child : div->children) @@ -2392,33 +2392,6 @@ namespace nana //if name violate the naming convention. place_parts::check_field_name(name); - /* //deprecated - implement::division * div_ptr = nullptr; - implement::field_gather * field_ptr = nullptr; - { - auto i = impl_->fields.find(name); - if (i != impl_->fields.end()) - field_ptr = i->second; - } - - if (field_ptr) - { - //remove the existing div object - div_ptr = field_ptr->attached; - } - else - div_ptr = impl_->search_div_name(impl_->root_division.get(), name); - - if (nullptr == div_ptr) - { - std::string what = "nana::place: field '"; - what += name; - what += "' is not found."; - - throw std::invalid_argument(what); - } - */ - auto div_ptr = impl_->search_div_name(impl_->root_division.get(), name); if (!div_ptr) { @@ -2434,7 +2407,6 @@ namespace nana implement::division * div_owner = div_ptr->div_owner; implement::division * div_next = div_ptr->div_next; - implement::division * div_bro = nullptr; if (div_owner) { for (auto i = div_owner->children.begin(); i != div_owner->children.end(); ++i) @@ -2444,7 +2416,6 @@ namespace nana replaced = &(*i); break; } - div_bro = i->get(); } } else @@ -2458,7 +2429,6 @@ namespace nana auto modified = impl_->scan_div(tknizer); auto modified_ptr = modified.get(); modified_ptr->name = name; - //modified_ptr->field = field_ptr; replaced->swap(modified); @@ -2468,33 +2438,6 @@ namespace nana modified_ptr->div_owner = div_owner; modified_ptr->div_next = div_next; - //if (field_ptr) - // field_ptr->attached = modified_ptr; - /* - std::function attach; - attach = [this, &attach](implement::division* div) - { - if (!div->name.empty()) - { - auto i = impl_->fields.find(div->name); - if (impl_->fields.end() != i) - { - if (i->second->attached != div) - { - i->second->attached = div; - div->field = i->second; - } - } - } - - for (auto& child : div->children) - { - attach(child.get()); - } - }; - - attach(impl_->root_division.get()); - */ } catch (...) { @@ -2538,7 +2481,7 @@ namespace nana void place::field_visible(const char* name, bool vsb) { if (!name) name = ""; - + //May throw std::invalid_argument place_parts::check_field_name(name); diff --git a/source/gui/widgets/categorize.cpp b/source/gui/widgets/categorize.cpp index 20afdfbf..92fb9743 100644 --- a/source/gui/widgets/categorize.cpp +++ b/source/gui/widgets/categorize.cpp @@ -14,7 +14,6 @@ #include #include #include -//#include //deprecated #include #include diff --git a/source/gui/widgets/checkbox.cpp b/source/gui/widgets/checkbox.cpp index 608f3fa5..582803cc 100644 --- a/source/gui/widgets/checkbox.cpp +++ b/source/gui/widgets/checkbox.cpp @@ -11,7 +11,6 @@ */ #include -//#include //deprecated #include #include #include diff --git a/source/gui/widgets/date_chooser.cpp b/source/gui/widgets/date_chooser.cpp index a56a3202..b46b29a5 100644 --- a/source/gui/widgets/date_chooser.cpp +++ b/source/gui/widgets/date_chooser.cpp @@ -12,7 +12,6 @@ #include #include -//#include //deprecated #include #include diff --git a/source/gui/widgets/menu.cpp b/source/gui/widgets/menu.cpp index d42f2b79..fd206764 100644 --- a/source/gui/widgets/menu.cpp +++ b/source/gui/widgets/menu.cpp @@ -12,7 +12,6 @@ #include #include -#include #include #include #include diff --git a/source/gui/widgets/skeletons/text_editor.cpp b/source/gui/widgets/skeletons/text_editor.cpp index e568fbee..29e5a181 100644 --- a/source/gui/widgets/skeletons/text_editor.cpp +++ b/source/gui/widgets/skeletons/text_editor.cpp @@ -2250,7 +2250,7 @@ namespace nana{ namespace widgets break; case keyboard::os_end: if (caret.y != nlines - 1) { - caret.y = nlines - 1; + caret.y = static_cast(nlines - 1); changed = true; } break; @@ -2265,7 +2265,7 @@ namespace nana{ namespace widgets }else { if (caret.y != 0) { --caret.y; - caret.x = textbase_.getline(caret.y).size(); + caret.x = static_cast(textbase_.getline(caret.y).size()); changed = true; } } @@ -2309,7 +2309,7 @@ namespace nana{ namespace widgets break; case keyboard::os_end: if (caret.x < lnsz) { - caret.x = lnsz; + caret.x = static_cast(lnsz); changed = true; } break; diff --git a/source/gui/widgets/tabbar.cpp b/source/gui/widgets/tabbar.cpp index c4a0e63b..624b5db1 100644 --- a/source/gui/widgets/tabbar.cpp +++ b/source/gui/widgets/tabbar.cpp @@ -97,7 +97,7 @@ namespace nana { int x = r.x + (static_cast(r.width) - 14) / 2; int y = r.y + (static_cast(r.height) - 14) / 2; - + ::nana::color clr; switch(sta) @@ -114,12 +114,10 @@ namespace nana graph.rectangle(r, true, bgcolor_); facade cross; cross.draw(graph, {}, clr, { x, y, 14, 6 }, element_state::normal); - //nana::paint::gadget::cross(graph, x, y, 14, 6, clr); //deprecated } virtual void close(graph_reference graph, const nana::rectangle& r, state_t sta) { - //nana::paint::gadget::close_16_pixels(graph, r.x + (r.width - 16) / 2, r.y + (r.height - 16) / 2, 1, colors::black); //deprecated facade x_icon; x_icon.draw(graph, {}, colors::black, { r.x + static_cast(r.width - 16) / 2, r.y + static_cast(r.height - 16) / 2, 16, 16 }, element_state::normal); if(item_renderer::highlight == sta) @@ -144,8 +142,6 @@ namespace nana else if (!active) clr = ::nana::color{ 0x92, 0x99, 0xA4 }; - - //gadget::close_16_pixels(graph, r.x - (16 - r.width) / 2, r.y - (16 - r.height) / 2, 1, clr); //deprecated facade x_icon; x_icon.draw(graph, {}, colors::black, { r.x + static_cast(r.width - 16) / 2, r.y + static_cast(r.height - 16) / 2, 16, 16 }, element_state::normal); @@ -153,19 +149,16 @@ namespace nana virtual void back(graph_reference graph, const nana::rectangle& r, state_t sta) { - //using namespace nana::paint::gadget; //deprecated _m_draw_arrow(graph, r, sta, direction::west); } virtual void next(graph_reference graph, const nana::rectangle& r, state_t sta) { - //using namespace nana::paint::gadget; //deprecated _m_draw_arrow(graph, r, sta, direction::east); } virtual void list(graph_reference graph, const nana::rectangle& r, state_t sta) { - //using namespace nana::paint::gadget; //deprecated _m_draw_arrow(graph, r, sta, direction::south); } private: @@ -1448,7 +1441,6 @@ namespace nana private: void _m_calc_metrics(graph_reference graph, std::forward_list& items) { - const auto height_px = graph.height(); std::vector pxs; unsigned pixels = 0; diff --git a/source/paint/gadget.cpp b/source/paint/gadget.cpp deleted file mode 100644 index c6da79e6..00000000 --- a/source/paint/gadget.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Graphics Gadget Implementation - * 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/paint/gadget.cpp - */ - -#include -#include - -namespace nana -{ -namespace paint -{ -namespace gadget -{ - void close_16_pixels(::nana::paint::graphics& graph, int x, int y, unsigned style, const ::nana::color& clr) - { - graph.set_color(clr); - if(0 == style) - { - x += 3; - y += 3; - - graph.line({ x, y }, { x + 9, y + 9 }); - graph.line({ x + 1, y }, { x + 9, y + 8 }); - graph.line({ x, y + 1 }, { x + 8, y + 9 }); - - graph.line({ x + 9, y }, { x, y + 9 }); - graph.line({ x + 8, y }, { x, y + 8 }); - graph.line({ x + 9, y + 1 }, { x + 1, y + 9 }); - } - else - { - x += 4; - y += 4; - - graph.line({ x, y }, { x + 7, y + 7 }); - graph.line({ x + 1, y }, { x + 7, y + 6 }); - graph.line({ x, y + 1 }, { x + 6, y + 7 }); - - graph.line({ x + 7, y }, { x, y + 7 }); - graph.line({ x + 6, y }, { x, y + 6 }); - graph.line({ x + 7, y + 1 }, { x + 1, y + 7 }); - } - } - - void cross(graphics& graph, int x, int y, unsigned size, unsigned thickness, const ::nana::color& clr) - { - if (thickness + 2 <= size) - { - int gap = (size - thickness) / 2; - - nana::point ps[12]; - ps[0].x = x + gap; - ps[1].x = ps[0].x + thickness - 1; - ps[1].y = ps[0].y = y; - - ps[2].x = ps[1].x; - ps[2].y = y + gap; - - ps[3].x = ps[2].x + gap; - ps[3].y = ps[2].y; - - ps[4].x = ps[3].x; - ps[4].y = ps[3].y + thickness - 1; - - ps[5].x = ps[1].x; - ps[5].y = ps[4].y; - - ps[6].x = ps[5].x; - ps[6].y = ps[5].y + gap; - - ps[7].x = x + gap; - ps[7].y = ps[6].y; - - ps[8].x = ps[7].x; - ps[8].y = ps[4].y; - - ps[9].x = x; - ps[9].y = ps[4].y; - - ps[10].x = x; - ps[10].y = y + gap; - - ps[11].x = x + gap; - ps[11].y = y + gap; - - graph.set_color(clr.blend(colors::black, true)); - - for (int i = 0; i < 11; ++i) - graph.line(ps[i], ps[i + 1]); - graph.line(ps[11], ps[0]); - - graph.set_color(clr); - graph.rectangle(rectangle{ ps[10].x + 1, ps[10].y + 1, (gap << 1) + thickness - 2, thickness - 2 }, true); - graph.rectangle(rectangle{ ps[0].x + 1, ps[0].y + 1, thickness - 2, (gap << 1) + thickness - 2 }, true); - } - } -}//end namespace gadget - -}//end namespace paint -}//end namespace nana diff --git a/source/paint/graphics.cpp b/source/paint/graphics.cpp index cba4b272..562d6fac 100644 --- a/source/paint/graphics.cpp +++ b/source/paint/graphics.cpp @@ -845,13 +845,13 @@ namespace paint BITMAPFILEHEADER bmFileHeader = { 0 }; bmFileHeader.bfType = 0x4d42; //bmp bmFileHeader.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER); - bmFileHeader.bfSize = bmFileHeader.bfOffBits + imageBytes; + bmFileHeader.bfSize = bmFileHeader.bfOffBits + static_cast(imageBytes); HANDLE hFile = ::CreateFileW(static_cast(::nana::charset(file_utf8, ::nana::unicode::utf8)).data(), GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); DWORD dwWrite = 0; ::WriteFile(hFile, &bmFileHeader, sizeof(BITMAPFILEHEADER), &dwWrite, nullptr); ::WriteFile(hFile, &bmpInfo.bmiHeader, sizeof(BITMAPINFOHEADER), &dwWrite, nullptr); - ::WriteFile(hFile, pData, imageBytes, &dwWrite, nullptr); + ::WriteFile(hFile, pData, static_cast(imageBytes), &dwWrite, nullptr); ::CloseHandle(hFile); ::DeleteObject(hBmp);