remove paint::gadget

2015-08-20 01:09:29 +08:00 · 2015-08-20 01:09:29 +08:00 · 42443dcafd
commit 42443dcafd
parent 4323977908
27 changed files with 1024 additions and 763 deletions
--- a/build/codeblocks/nana.cbp
+++ b/build/codeblocks/nana.cbp
@ -102,7 +102,6 @@
 		<Unit filename="../../source/internationalization.cpp" />
 		<Unit filename="../../source/paint/detail/image_process_provider.cpp" />
 		<Unit filename="../../source/paint/detail/native_paint_interface.cpp" />
 		<Unit filename="../../source/paint/gadget.cpp" />
 		<Unit filename="../../source/paint/graphics.cpp" />
 		<Unit filename="../../source/paint/image.cpp" />
 		<Unit filename="../../source/paint/image_process_selector.cpp" />
--- 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
 	<nana/gui/detail/element_store.hpp>
 1363362719 source:d:\git.repo\nana\source\any.cpp
 	<nana/any.hpp>
 1362509572 source:d:\git.repo\nana\source\audio\detail\audio_device.cpp
 	<nana/audio/detail/audio_device.hpp>
 	<nana/system/platform.hpp>
 	<pthread.h>
 	<unistd.h>
 	<sys/time.h>
 	<errno.h>
 1439496157 source:d:\git.repo\nana\source\audio\detail\audio_stream.cpp
 	<nana/audio/detail/audio_stream.hpp>
 	<nana/charset.hpp>
 1362509721 source:d:\git.repo\nana\source\audio\detail\buffer_preparation.cpp
 	<nana/audio/detail/buffer_preparation.hpp>
 	<cstring>
 1353253406 source:d:\git.repo\nana\source\audio\player.cpp
 	<nana/audio/player.hpp>
 	<nana/audio/detail/audio_stream.hpp>
 	<nana/audio/detail/audio_device.hpp>
 	<nana/audio/detail/buffer_preparation.hpp>
 	<nana/system/platform.hpp>
 1439496157 source:d:\git.repo\nana\source\basic_types.cpp
 	<nana/basic_types.hpp>
 	<regex>
 	<vector>
 	<algorithm>
 	<stdexcept>
 1439496157 source:d:\git.repo\nana\source\charset.cpp
 	<nana/charset.hpp>
 	<utility>
 	<nana/deploy.hpp>
 	<cwchar>
 	<clocale>
 	<codecvt>
 	<windows.h>
 1439496157 source:d:\git.repo\nana\source\datetime.cpp
 	<nana/config.hpp>
 	<nana/datetime.hpp>
 	<windows.h>
 	<cassert>
 1439496157 source:d:\git.repo\nana\source\deploy.cpp
 	<nana/deploy.hpp>
 	<cstdlib>
 	<stdexcept>
 	<windows.h>
 	<string.h>
 	<sstream>
 1439496157 source:d:\git.repo\nana\source\detail\platform_spec_selector.cpp
 	<nana/config.hpp>
 	"win32/platform_spec.cpp"
 	"linux_X11/platform_spec.cpp"
 1439496157 d:\git.repo\nana\source\detail\win32\platform_spec.cpp
 	<nana/config.hpp>
 	<shellapi.h>
 	<stdexcept>
 	<VersionHelpers.h>
 1439496157 d:\git.repo\nana\source\detail\linux_x11\platform_spec.cpp
 	<nana/config.hpp>
 	<X11/Xlocale.h>
 	<locale>
 	<map>
 	<set>
 	<algorithm>
 	<nana/paint/graphics.hpp>
 	<nana/gui/detail/bedrock.hpp>
 	<nana/gui/detail/basic_window.hpp>
 	<nana/system/platform.hpp>
 	<errno.h>
 	<sstream>
 	"msg_dispatcher.hpp"
 1439496157 d:\git.repo\nana\source\detail\linux_x11\msg_dispatcher.hpp
 	<nana/detail/linux_X11/msg_packet.hpp>
 	<nana/system/platform.hpp>
 	<list>
 	<set>
 	<map>
 	<mutex>
 	<condition_variable>
 	<memory>
 	<thread>
 1365203880 source:d:\git.repo\nana\source\exceptions.cpp
 	<nana/exceptions.hpp>
 1365203878 source:d:\git.repo\nana\source\filesystem\file_iterator.cpp
 	<nana/filesystem/file_iterator.hpp>
 1365203878 source:d:\git.repo\nana\source\filesystem\fs_utility.cpp
 	<nana/filesystem/fs_utility.hpp>
 	<nana/filesystem/file_iterator.hpp>
 	<vector>
 	<windows.h>
 	<shlobj.h>
 	<nana/datetime.hpp>
 	<nana/charset.hpp>
 	<sys/stat.h>
 	<sys/types.h>
 	<dirent.h>
 	<cstdio>
 	<cstring>
 	<errno.h>
 	<unistd.h>
 	<stdlib.h>
 1439496157 source:d:\git.repo\nana\source\gui\animation.cpp
 	<nana/gui/animation.hpp>
 	<nana/gui/drawing.hpp>
 	<nana/system/timepiece.hpp>
 	<nana/system/platform.hpp>
 	<vector>
 	<list>
 	<algorithm>
 	<nana/std_thread.hpp>
 	<nana/std_mutex.hpp>
 	<nana/std_condition_variable.hpp>
 	<mutex>
 	<condition_variable>
 	<thread>
 1423350892 source:d:\git.repo\nana\source\gui\basis.cpp
 	<nana/gui/basis.hpp>
 1439496157 source:d:\git.repo\nana\source\gui\detail\basic_window.cpp
 	<nana/gui/detail/basic_window.hpp>
 	<nana/gui/detail/native_window_interface.hpp>
 1439496157 source:d:\git.repo\nana\source\gui\detail\bedrock_pi.cpp
 	<nana/config.hpp>
 	<nana/gui/detail/bedrock_pi_data.hpp>
 	<nana/gui/detail/event_code.hpp>
 	<nana/system/platform.hpp>
 	<sstream>
 	<nana/system/timepiece.hpp>
 	<nana/gui/wvl.hpp>
 	<nana/gui/detail/inner_fwd_implement.hpp>
 	<nana/gui/detail/native_window_interface.hpp>
 	<nana/gui/layout_utility.hpp>
 	<nana/gui/detail/element_store.hpp>
 	<algorithm>
 1439496157 source:d:\git.repo\nana\source\gui\detail\bedrock_selector.cpp
 	<nana/config.hpp>
 	"win32/bedrock.cpp"
 	"linux_X11/bedrock.cpp"
 1439496157 d:\git.repo\nana\source\gui\detail\win32\bedrock.cpp
 	<nana/config.hpp>
 	<nana/gui/detail/bedrock.hpp>
 	<nana/gui/detail/bedrock_pi_data.hpp>
 	<nana/gui/detail/event_code.hpp>
 	<nana/system/platform.hpp>
 	<sstream>
 	<nana/system/timepiece.hpp>
 	<nana/gui.hpp>
 	<nana/gui/detail/inner_fwd_implement.hpp>
 	<nana/gui/detail/native_window_interface.hpp>
 	<nana/gui/layout_utility.hpp>
 	<nana/gui/detail/element_store.hpp>
 	<nana/gui/detail/color_schemes.hpp>
 1439496157 d:\git.repo\nana\source\gui\detail\linux_x11\bedrock.cpp
 	<nana/config.hpp>
 	<nana/gui/detail/bedrock_pi_data.hpp>
 	<nana/gui/detail/event_code.hpp>
 	<nana/system/platform.hpp>
 	<nana/gui/detail/inner_fwd_implement.hpp>
 	<nana/gui/detail/native_window_interface.hpp>
 	<nana/gui/layout_utility.hpp>
 	<nana/gui/detail/element_store.hpp>
 	<errno.h>
 1423350892 source:d:\git.repo\nana\source\gui\detail\color_schemes.cpp
 	<nana/gui/detail/color_schemes.hpp>
 	<map>
 1439496157 source:d:\git.repo\nana\source\gui\detail\drawer.cpp
 	<nana/config.hpp>
 	<nana/gui/detail/bedrock.hpp>
 	<nana/gui/detail/drawer.hpp>
 	<nana/gui/detail/dynamic_drawing_object.hpp>
 	<nana/gui/detail/effects_renderer.hpp>
 	<nana/gui/detail/basic_window.hpp>
 	<nana/detail/linux_X11/platform_spec.hpp>
 1408986718 source:d:\git.repo\nana\source\gui\detail\element_store.cpp
 	<nana/gui/detail/element_store.hpp>
 1439496157 source:d:\git.repo\nana\source\gui\detail\events_operation.cpp
 	<nana/gui/detail/events_operation.hpp>
 1439828940 source:d:\git.repo\nana\source\gui\detail\native_window_interface.cpp
 	<nana/config.hpp>
 	<nana/gui/detail/native_window_interface.hpp>
 	<nana/gui/screen.hpp>
 	<nana/std_mutex.hpp>
 	<mutex>
 	<map>
 	"../../paint/detail/image_ico.hpp"
 	<nana/system/platform.hpp>
 	<nana/gui/detail/bedrock.hpp>
 1439496158 d:\git.repo\nana\source\paint\detail\image_ico.hpp
 	<nana/paint/detail/image_impl_interface.hpp>
 1439496157 source:d:\git.repo\nana\source\gui\detail\window_layout.cpp
 	<nana/gui/detail/window_layout.hpp>
 	<nana/gui/detail/basic_window.hpp>
 	<nana/gui/detail/native_window_interface.hpp>
 	<nana/gui/layout_utility.hpp>
 	<algorithm>
 1439496157 source:d:\git.repo\nana\source\gui\detail\window_manager.cpp
 	<nana/config.hpp>
 	<nana/gui/detail/bedrock.hpp>
 	<nana/gui/detail/handle_manager.hpp>
 	<nana/gui/detail/window_manager.hpp>
 	<nana/gui/detail/native_window_interface.hpp>
 	<nana/gui/detail/inner_fwd_implement.hpp>
 	<nana/gui/layout_utility.hpp>
 	<nana/gui/detail/effects_renderer.hpp>
 	<stdexcept>
 	<algorithm>
 1439746409 source:d:\git.repo\nana\source\gui\dragger.cpp
 	<nana/gui/dragger.hpp>
 1423350892 source:d:\git.repo\nana\source\gui\drawing.cpp
 	<nana/gui/drawing.hpp>
 	<nana/gui/programming_interface.hpp>
 	<nana/gui/detail/basic_window.hpp>
 1439496157 source:d:\git.repo\nana\source\gui\effects.cpp
 	<nana/gui/effects.hpp>
 	<nana/gui/programming_interface.hpp>
 1439829040 source:d:\git.repo\nana\source\gui\element.cpp
 	<nana/gui/element.hpp>
 	<nana/gui/detail/bedrock.hpp>
 	<nana/gui/detail/element_store.hpp>
 	<nana/paint/image.hpp>
 	<map>
 	<string>
 	<nana/std_mutex.hpp>
 	<mutex>
 1439496157 source:d:\git.repo\nana\source\gui\filebox.cpp
 	<nana/gui.hpp>
 	<nana/gui/filebox.hpp>
 	<nana/filesystem/fs_utility.hpp>
 	<windows.h>
 	<nana/gui/widgets/label.hpp>
 	<nana/gui/widgets/button.hpp>
 	<nana/gui/widgets/listbox.hpp>
 	<nana/gui/widgets/categorize.hpp>
 	<nana/gui/widgets/textbox.hpp>
 	<nana/gui/widgets/treebox.hpp>
 	<nana/gui/widgets/combox.hpp>
 	<nana/filesystem/file_iterator.hpp>
 	<nana/gui/place.hpp>
 	<stdexcept>
 	<algorithm>
 1439496157 source:d:\git.repo\nana\source\gui\layout_utility.cpp
 	<nana/gui/layout_utility.hpp>
 1439496157 source:d:\git.repo\nana\source\gui\msgbox.cpp
 	<nana/gui.hpp>
 	<nana/gui/widgets/label.hpp>
 	<nana/gui/widgets/button.hpp>
 	<nana/gui/widgets/spinbox.hpp>
 	<nana/gui/widgets/combox.hpp>
 	<nana/gui/widgets/textbox.hpp>
 	<nana/gui/widgets/panel.hpp>
 	<nana/gui/widgets/picture.hpp>
 	<nana/gui/place.hpp>
 	<nana/datetime.hpp>
 	<nana/internationalization.hpp>
 	<nana/gui/filebox.hpp>
 	<functional>
 	<cstdlib>
 	<windows.h>
 	<nana/gui/widgets/picture.hpp>
 	<nana/paint/pixel_buffer.hpp>
 1439496157 source:d:\git.repo\nana\source\gui\notifier.cpp
 	<nana/deploy.hpp>
 	<nana/gui/programming_interface.hpp>
 	<nana/gui/notifier.hpp>
 	<nana/gui/timer.hpp>
 	<unordered_map>
 	<unordered_set>
 	<nana/std_mutex.hpp>
 	<mutex>
 	<nana/detail/win32/platform_spec.hpp>
 	<nana/system/platform.hpp>
 	<iostream>
 1439746410 source:d:\git.repo\nana\source\gui\programming_interface.cpp
 	<nana/gui/programming_interface.hpp>
 	<nana/gui/detail/basic_window.hpp>
 	<nana/system/platform.hpp>
 	<nana/gui/detail/native_window_interface.hpp>
 	<nana/gui/widgets/widget.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\screen.cpp
 	<nana/gui/screen.hpp>
 	<vector>
 	<memory>
 	<nana/gui/detail/native_window_interface.hpp>
 	<nana/gui/programming_interface.hpp>
 	<windows.h>
 1415011766 source:d:\git.repo\nana\source\gui\state_cursor.cpp
 	<nana/gui/state_cursor.hpp>
 	<nana/gui/detail/bedrock.hpp>
 	<nana/gui/detail/basic_window.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\timer.cpp
 	<nana/deploy.hpp>
 	<nana/gui/timer.hpp>
 	<map>
 	<memory>
 	<nana/std_mutex.hpp>
 	<mutex>
 	<windows.h>
 	<nana/system/platform.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\tooltip.cpp
 	<nana/gui/tooltip.hpp>
 	<nana/gui/widgets/label.hpp>
 	<nana/gui/timer.hpp>
 	<nana/gui/screen.hpp>
 	<memory>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\button.cpp
 	<nana/gui/widgets/button.hpp>
 	<nana/paint/text_renderer.hpp>
 1439829040 source:d:\git.repo\nana\source\gui\widgets\categorize.cpp
 	<nana/gui/wvl.hpp>
 	<nana/gui/widgets/categorize.hpp>
 	<nana/gui/widgets/float_listbox.hpp>
 	<nana/gui/element.hpp>
 	<nana/gui/widgets/detail/tree_cont.hpp>
 	<stdexcept>
 1439829040 source:d:\git.repo\nana\source\gui\widgets\checkbox.cpp
 	<nana/gui/widgets/checkbox.hpp>
 	<nana/paint/text_renderer.hpp>
 	<nana/gui/element.hpp>
 	<algorithm>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\combox.cpp
 	<nana/gui.hpp>
 	<nana/gui/widgets/combox.hpp>
 	<nana/gui/element.hpp>
 	<nana/system/dataexch.hpp>
 	<nana/gui/widgets/float_listbox.hpp>
 	<nana/gui/widgets/skeletons/text_editor.hpp>
 	<nana/gui/widgets/skeletons/textbase_export_interface.hpp>
 	<iterator>
 1439829040 source:d:\git.repo\nana\source\gui\widgets\date_chooser.cpp
 	<nana/gui/widgets/date_chooser.hpp>
 	<nana/gui/element.hpp>
 	<nana/system/platform.hpp>
 	<sstream>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\float_listbox.cpp
 	<nana/gui/widgets/float_listbox.hpp>
 	<nana/gui/widgets/scroll.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\form.cpp
 	<nana/gui/widgets/form.hpp>
 1408985395 source:d:\git.repo\nana\source\gui\widgets\frame.cpp
 	<nana/gui/widgets/frame.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\group.cpp
 	<nana/gui/widgets/group.hpp>
 	<nana/gui/widgets/label.hpp>
 	<nana/gui/drawing.hpp>
 	<nana/gui/widgets/checkbox.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\label.cpp
 	<nana/gui/widgets/label.hpp>
 	<nana/unicode_bidi.hpp>
 	<nana/gui/widgets/skeletons/text_token_stream.hpp>
 	<nana/system/platform.hpp>
 	<stdexcept>
 	<sstream>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\listbox.cpp
 	<nana/gui/widgets/listbox.hpp>
 	<nana/gui/widgets/scroll.hpp>
 	<nana/gui/widgets/panel.hpp>
 	<nana/gui/layout_utility.hpp>
 	<nana/gui/element.hpp>
 	<list>
 	<deque>
 	<stdexcept>
 	<algorithm>
 	<nana/system/dataexch.hpp>
 	<cassert>
 1439828820 source:d:\git.repo\nana\source\gui\widgets\menu.cpp
 	<nana/gui/widgets/menu.hpp>
 	<nana/system/platform.hpp>
 	<nana/gui/element.hpp>
 	<nana/gui/wvl.hpp>
 	<nana/paint/text_renderer.hpp>
 	<cctype>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\menubar.cpp
 	<nana/gui/widgets/menubar.hpp>
 	<stdexcept>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\panel.cpp
 	<nana/gui/widgets/panel.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\picture.cpp
 	<nana/gui/widgets/picture.hpp>
 	<nana/gui/layout_utility.hpp>
 	<nana/paint/image.hpp>
 	<nana/gui/element.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\progress.cpp
 	<nana/gui/widgets/progress.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\scroll.cpp
 	<nana/gui/widgets/scroll.hpp>
 	<nana/gui/element.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\skeletons\text_editor.cpp
 	<nana/gui/widgets/skeletons/text_editor.hpp>
 	<nana/gui/widgets/skeletons/textbase_export_interface.hpp>
 	<nana/gui/element.hpp>
 	<nana/system/dataexch.hpp>
 	<nana/unicode_bidi.hpp>
 	<numeric>
 	<cwctype>
 	<cstring>
 	<set>
 	<algorithm>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\slider.cpp
 	<nana/gui/widgets/slider.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\spinbox.cpp
 	<nana/gui/widgets/spinbox.hpp>
 	<nana/gui/widgets/skeletons/text_editor.hpp>
 	<nana/gui/element.hpp>
 	<nana/gui/timer.hpp>
 	<algorithm>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\textbox.cpp
 	<nana/gui/widgets/textbox.hpp>
 	<nana/gui/widgets/skeletons/text_editor.hpp>
 	<stdexcept>
 	<sstream>
 	<nana/gui/detail/bedrock.hpp>
 	<nana/gui/detail/inner_fwd_implement.hpp>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\toolbar.cpp
 	<nana/gui/widgets/toolbar.hpp>
 	<nana/gui/tooltip.hpp>
 	<vector>
 1439496158 source:d:\git.repo\nana\source\gui\widgets\treebox.cpp
 	<nana/gui/widgets/treebox.hpp>
 	<nana/gui/widgets/scroll.hpp>
 	<nana/gui/element.hpp>
 	<nana/gui/layout_utility.hpp>
 	<nana/system/platform.hpp>
 	<stdexcept>
 1439746410 source:d:\git.repo\nana\source\gui\widgets\widget.cpp
 	<nana/gui/widgets/widget.hpp>
 	<nana/gui/tooltip.hpp>
 	<nana/gui/detail/widget_notifier_interface.hpp>
 1408984042 source:d:\git.repo\nana\source\gui\wvl.cpp
 	<nana/gui/wvl.hpp>
 1425221155 source:d:\git.repo\nana\source\internationalization.cpp
 	<nana/internationalization.hpp>
 	<nana/gui/widgets/widget.hpp>
 	<unordered_map>
 	<fstream>
 	<sstream>
 	<memory>
 1423350893 source:d:\git.repo\nana\source\paint\detail\image_process_provider.cpp
 	<nana/paint/detail/image_process_provider.hpp>
 	<nana/paint/detail/image_processor.hpp>
 1439496158 source:d:\git.repo\nana\source\paint\detail\native_paint_interface.cpp
 	<nana/config.hpp>
 	<nana/paint/detail/native_paint_interface.hpp>
 	<nana/paint/pixel_buffer.hpp>
 	<nana/gui/layout_utility.hpp>
 	<windows.h>
 	<X11/Xlib.h>
 1439746289 source:d:\git.repo\nana\source\paint\graphics.cpp
 	<nana/config.hpp>
 	<nana/gui/detail/bedrock.hpp>
 	<nana/paint/graphics.hpp>
 	<nana/paint/detail/native_paint_interface.hpp>
 	<nana/paint/pixel_buffer.hpp>
 	<nana/gui/layout_utility.hpp>
 	<nana/unicode_bidi.hpp>
 	<algorithm>
 	<windows.h>
 	<X11/Xlib.h>
 1439496158 source:d:\git.repo\nana\source\paint\image.cpp
 	<nana/config.hpp>
 	<nana/paint/image.hpp>
 	<algorithm>
 	<fstream>
 	<iterator>
 	<stdexcept>
 	<nana/paint/detail/image_impl_interface.hpp>
 	<nana/paint/pixel_buffer.hpp>
 	"detail/image_png.hpp"
 	"detail/image_bmp.hpp"
 	"detail/image_ico.hpp"
 1439687843 d:\git.repo\nana\source\paint\detail\image_png.hpp
 	<nana/paint/detail/image_impl_interface.hpp>
 	<nana/extrlib/png.h>
 	<png.h>
 	<stdio.h>
 	<nana/paint/pixel_buffer.hpp>
 1439496158 d:\git.repo\nana\source\paint\detail\image_bmp.hpp
 	<nana/paint/detail/image_impl_interface.hpp>
 	<memory>
 1376313789 source:d:\git.repo\nana\source\paint\image_process_selector.cpp
 	<nana/paint/image_process_selector.hpp>
 1439496158 source:d:\git.repo\nana\source\paint\pixel_buffer.cpp
 	<nana/config.hpp>
 	<nana/paint/pixel_buffer.hpp>
 	<nana/gui/layout_utility.hpp>
 	<nana/paint/detail/native_paint_interface.hpp>
 	<nana/paint/detail/image_process_provider.hpp>
 	<stdexcept>
 1423350893 source:d:\git.repo\nana\source\paint\text_renderer.cpp
 	<nana/config.hpp>
 	<nana/paint/text_renderer.hpp>
 	<nana/unicode_bidi.hpp>
 	<nana/paint/detail/native_paint_interface.hpp>
 1439496158 source:d:\git.repo\nana\source\system\dataexch.cpp
 	<nana/system/dataexch.hpp>
 	<nana/traits.hpp>
 	<nana/paint/graphics.hpp>
 	<vector>
 	<cassert>
 	<windows.h>
 	<nana/gui/detail/bedrock.hpp>
 	<nana/gui/detail/basic_window.hpp>
 1387007333 source:d:\git.repo\nana\source\system\platform.cpp
 	<nana/deploy.hpp>
 	<windows.h>
 	<time.h>
 	<errno.h>
 	<unistd.h>
 	<sys/time.h>
 	<sys/syscall.h>
 1365203879 source:d:\git.repo\nana\source\system\shared_wrapper.cpp
 	<nana/system/shared_wrapper.hpp>
 	<algorithm>
 	<iterator>
 	<dlfcn.h>
 	<windows.h>
 1342280997 source:d:\git.repo\nana\source\system\timepiece.cpp
 	<nana/system/timepiece.hpp>
 	<nana/config.hpp>
 	<windows.h>
 	<sys/time.h>
 1386165989 source:d:\git.repo\nana\source\threads\pool.cpp
 	<nana/threads/pool.hpp>
 	<nana/system/platform.hpp>
 	<time.h>
 	<deque>
 	<vector>
 	<nana/std_condition_variable.hpp>
 	<nana/std_mutex.hpp>
 	<condition_variable>
 	<mutex>
 	<windows.h>
 	<process.h>
 	<pthread.h>
 1365203748 source:d:\git.repo\nana\source\traits.cpp
 	<nana/traits.hpp>
 1439496158 source:d:\git.repo\nana\source\unicode_bidi.cpp
 	<nana/unicode_bidi.hpp>
 1439830958 source:d:\git.repo\nana\source\gui\widgets\tabbar.cpp
 	<nana/gui/widgets/tabbar.hpp>
 	<nana/gui/widgets/menu.hpp>
 	<nana/paint/text_renderer.hpp>
 	<nana/gui/element.hpp>
 	<stdexcept>
 	<list>
 	<forward_list>
--- a/build/codeblocks/nana.layout
+++ b/build/codeblocks/nana.layout
@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Debug" />
-	<File name="..\..\source\paint\text_renderer.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\source\gui\msgbox.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="5894" topLine="205" />
+			<Cursor1 position="48249" topLine="407" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\detail\native_window_interface.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="4901" topLine="171" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\detail\window_layout.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="5198" topLine="161" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\detail\window_manager.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="30124" topLine="1046" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\listbox.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -26,9 +11,9 @@
 			<Cursor1 position="12428" topLine="532" />
 		</Cursor>
 	</File>
-	<File name="..\..\source\gui\dragger.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="..\..\source\gui\place.cpp" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="1316" topLine="59" />
+			<Cursor1 position="63864" topLine="2449" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\menu.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -36,66 +21,26 @@
 			<Cursor1 position="27717" topLine="1044" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\threads\pool.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="5569" topLine="249" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\element.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="20890" topLine="542" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\filebox.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="22934" topLine="871" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\msgbox.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="48249" topLine="407" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\charset.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="412" topLine="15" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\threads\pool.cpp" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="5569" topLine="249" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\programming_interface.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="5022" topLine="159" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\tabbar.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="18615" topLine="760" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\textbox.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="11188" topLine="459" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\toolbar.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="2244" topLine="84" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\detail\platform_spec_selector.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="587" topLine="2" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\treebox.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="15535" topLine="539" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\audio\detail\buffer_preparation.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="1924" topLine="62" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\tooltip.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="4739" topLine="194" />
@ -126,29 +71,89 @@
 			<Cursor1 position="6998" topLine="275" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\audio\detail\audio_device.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="6256" topLine="215" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\combox.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="16572" topLine="610" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\tabbar.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="37420" topLine="1435" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\date_chooser.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="457" topLine="3" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\textbox.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="11188" topLine="459" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\toolbar.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="2244" topLine="84" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\widgets\treebox.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="15535" topLine="539" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\detail\native_window_interface.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="4901" topLine="171" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\detail\window_layout.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="5198" topLine="161" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\detail\window_manager.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="30124" topLine="1046" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\paint\graphics.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="30961" topLine="1020" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\dragger.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="1316" topLine="59" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\paint\image.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="3714" topLine="168" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\audio\detail\buffer_preparation.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="1924" topLine="62" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\element.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="20890" topLine="542" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\paint\text_renderer.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="5894" topLine="205" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\gui\filebox.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="22934" topLine="871" />
 		</Cursor>
 	</File>
 	<File name="..\..\source\audio\detail\audio_device.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="6256" topLine="215" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>
--- a/build/vc2013/nana.vcxproj
+++ b/build/vc2013/nana.vcxproj
@ -243,7 +243,6 @@
    <ClCompile Include="..\..\source\internationalization.cpp" />
    <ClCompile Include="..\..\source\paint\detail\image_process_provider.cpp" />
    <ClCompile Include="..\..\source\paint\detail\native_paint_interface.cpp" />
    <ClCompile Include="..\..\source\paint\gadget.cpp" />
    <ClCompile Include="..\..\source\paint\graphics.cpp" />
    <ClCompile Include="..\..\source\paint\image.cpp" />
    <ClCompile Include="..\..\source\paint\image_process_selector.cpp" />
@ -277,8 +276,8 @@
    <ClInclude Include="..\..\include\nana\extrlib\png.h" />
    <ClInclude Include="..\..\include\nana\extrlib\pngconf.h" />
    <ClInclude Include="..\..\include\nana\extrlib\pnglibconf.h" />
-	<ClInclude Include="..\..\include\nana\extrlib\zlib.h" />
+    <ClInclude Include="..\..\include\nana\extrlib\zlib.h" />
-	<ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp" />
+    <ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp" />
    <ClInclude Include="..\..\include\nana\filesystem\file_iterator.hpp" />
    <ClInclude Include="..\..\include\nana\filesystem\fs_utility.hpp" />
    <ClInclude Include="..\..\include\nana\fwd.hpp" />
@ -383,4 +382,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/build/vc2013/nana.vcxproj.filters
+++ b/build/vc2013/nana.vcxproj.filters
@ -119,7 +119,7 @@
    </ClCompile>
    <ClCompile Include="..\..\source\detail\win32\platform_spec.cpp">
      <Filter>Source Files\nana\detail\win32</Filter>
-	</ClCompile>
+    </ClCompile>
    <ClCompile Include="..\..\source\filesystem\filesystem.cpp">
      <Filter>Source Files\nana\filesystem</Filter>
    </ClCompile>
@ -261,9 +261,6 @@
    <ClCompile Include="..\..\source\paint\detail\native_paint_interface.cpp">
      <Filter>Source Files\nana\paint\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\gadget.cpp">
      <Filter>Source Files\nana\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\graphics.cpp">
      <Filter>Source Files\nana\paint</Filter>
    </ClCompile>
@ -645,7 +642,7 @@
    </ClInclude>
    <ClInclude Include="..\..\include\nana\extrlib\zlib.h">
      <Filter>Header Files\extrlib</Filter>
-	</ClInclude>
+    </ClInclude>
    <ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp">
      <Filter>Header Files\filesystem</Filter>
    </ClInclude>
@ -719,4 +716,4 @@
      <Filter>Header Files\gui\widgets</Filter>
    </ClInclude>
  </ItemGroup>
-</Project>
+</Project>
--- 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
+		{98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x64.ActiveCfg = Debug|x64
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x64.Build.0 = Debug|x64
+		{98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x64.Build.0 = Debug|x64
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x86.ActiveCfg = Debug|Win32
+		{98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x86.ActiveCfg = Debug|Win32
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x86.Build.0 = Debug|Win32
+		{98091380-2EC4-44B4-82A2-F0A6393BA908}.Debug|x86.Build.0 = Debug|Win32
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x64.ActiveCfg = Release|x64
+		{98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x64.ActiveCfg = Release|x64
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x64.Build.0 = Release|x64
+		{98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x64.Build.0 = Release|x64
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x86.ActiveCfg = Release|Win32
+		{98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x86.ActiveCfg = Release|Win32
-		{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x86.Build.0 = Release|Win32
+		{98091380-2EC4-44B4-82A2-F0A6393BA908}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/build/vc2015/nana.vcxproj
+++ b/build/vc2015/nana.vcxproj
@ -5,24 +5,24 @@
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|x64">
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|x64">
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|x64">
      <Configuration>Release</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{25B21068-491B-4A9F-B99F-6C27BF31BAAD}</ProjectGuid>
+    <ProjectGuid>{98091380-2EC4-44B4-82A2-F0A6393BA908}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>nana</RootNamespace>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -31,12 +31,6 @@
    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
@ -44,6 +38,12 @@
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
@ -54,46 +54,30 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="Shared">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>../bin/</OutDir>
+    <IncludePath>../../include;$(IncludePath)</IncludePath>
-    <IncludePath>..\..\include;$(IncludePath)</IncludePath>
+    <OutDir>..\bin\vc2015\</OutDir>
-    <SourcePath>..\..\source;$(VC_SourcePath);</SourcePath>
+    <TargetName>lib$(ProjectName)</TargetName>
    <TargetName>$(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)</TargetName>
    <IntDir>..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>..\..\include;$(IncludePath)</IncludePath>
+    <IncludePath>../../include;$(IncludePath)</IncludePath>
-    <SourcePath>..\..\source;$(VC_SourcePath);</SourcePath>
+    <OutDir>..\bin\vc2015\</OutDir>
-    <OutDir>../bin/</OutDir>
+    <TargetName>lib$(ProjectName)d</TargetName>
    <TargetName>$(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)</TargetName>
    <IntDir>..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <OutDir>../bin/</OutDir>
    <IncludePath>..\..\include;$(IncludePath)</IncludePath>
    <SourcePath>..\..\source;$(VC_SourcePath);</SourcePath>
    <TargetName>$(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)</TargetName>
    <IntDir>..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <IncludePath>..\..\include;$(IncludePath)</IncludePath>
    <SourcePath>..\..\source;$(VC_SourcePath);</SourcePath>
    <OutDir>../bin/</OutDir>
    <TargetName>$(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)</TargetName>
    <IntDir>..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@ -102,17 +86,11 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <MinimalRebuild>false</MinimalRebuild>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
    <Lib>
      <OutputFile>$(TargetPath)</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
@ -120,15 +98,14 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
    <Lib>
-      <OutputFile>$(TargetPath)</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -140,8 +117,6 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@ -149,9 +124,6 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
    </Link>
    <Lib>
      <OutputFile>$(TargetPath)</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
@ -161,8 +133,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@ -171,7 +142,7 @@
      <OptimizeReferences>true</OptimizeReferences>
    </Link>
    <Lib>
-      <OutputFile>$(TargetPath)</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemGroup>
@ -244,7 +215,6 @@
    <ClCompile Include="..\..\source\internationalization.cpp" />
    <ClCompile Include="..\..\source\paint\detail\image_process_provider.cpp" />
    <ClCompile Include="..\..\source\paint\detail\native_paint_interface.cpp" />
    <ClCompile Include="..\..\source\paint\gadget.cpp" />
    <ClCompile Include="..\..\source\paint\graphics.cpp" />
    <ClCompile Include="..\..\source\paint\image.cpp" />
    <ClCompile Include="..\..\source\paint\image_process_selector.cpp" />
@ -252,7 +222,6 @@
    <ClCompile Include="..\..\source\paint\text_renderer.cpp" />
    <ClCompile Include="..\..\source\system\dataexch.cpp" />
    <ClCompile Include="..\..\source\system\platform.cpp" />
    <ClCompile Include="..\..\source\system\shared_wrapper.cpp" />
    <ClCompile Include="..\..\source\system\timepiece.cpp" />
    <ClCompile Include="..\..\source\threads\pool.cpp" />
    <ClCompile Include="..\..\source\traits.cpp" />
--- a/build/vc2015/nana.vcxproj.filters
+++ b/build/vc2015/nana.vcxproj.filters
@ -13,298 +13,289 @@
      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
    </Filter>
-    <Filter Include="Source Files\nana">
+    <Filter Include="Source Files\audio">
-      <UniqueIdentifier>{b0bd11b1-bcbb-4e05-885e-44295bc1a7bb}</UniqueIdentifier>
+      <UniqueIdentifier>{9630500a-5aca-4625-a11b-1ba83a93895c}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\audio">
+    <Filter Include="Source Files\detail">
-      <UniqueIdentifier>{aab16aa3-c8d4-4495-8606-1b21ae739ee5}</UniqueIdentifier>
+      <UniqueIdentifier>{d43db913-0472-45f6-889e-b147a7b3eb7e}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\audio\detail">
+    <Filter Include="Source Files\filesystem">
-      <UniqueIdentifier>{c395f107-7102-415b-a019-54e7cf3575af}</UniqueIdentifier>
+      <UniqueIdentifier>{4e91af62-8e45-41d5-8bb9-1deb850de937}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\detail">
+    <Filter Include="Source Files\gui">
-      <UniqueIdentifier>{e2569be2-9e68-477d-8b59-e248595de6c7}</UniqueIdentifier>
+      <UniqueIdentifier>{c575e702-d7d3-48d2-a465-30e51ca72f8d}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\detail\win32">
+    <Filter Include="Source Files\paint">
-      <UniqueIdentifier>{52ed7f8e-fa48-495e-af1f-4df013205a35}</UniqueIdentifier>
+      <UniqueIdentifier>{e1fbd69a-2a82-419e-854a-0b5dbd0e0237}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\filesystem">
+    <Filter Include="Source Files\system">
-      <UniqueIdentifier>{87d14798-9015-4162-b9ab-72c741cff063}</UniqueIdentifier>
+      <UniqueIdentifier>{295ba47e-9dc7-4375-82bc-443b767eb87d}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\gui">
+    <Filter Include="Source Files\threads">
-      <UniqueIdentifier>{4f8e7d23-9fe1-4409-bb03-2bd0809e606b}</UniqueIdentifier>
+      <UniqueIdentifier>{b0854b25-60fc-47e2-a9df-5e4f2d28065c}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\gui\detail">
+    <Filter Include="Source Files\audio\detail">
-      <UniqueIdentifier>{85c9c1bb-d87b-4481-bf3c-7425f680a12d}</UniqueIdentifier>
+      <UniqueIdentifier>{b3023f5e-2759-409d-b6e8-5ef2fe6601ae}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\gui\detail\win32">
+    <Filter Include="Source Files\detail\win32">
-      <UniqueIdentifier>{8058b530-86ec-4d72-890d-345aa30db056}</UniqueIdentifier>
+      <UniqueIdentifier>{2ce139f3-ef8e-48b7-a82a-68003eac75da}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\gui\widgets">
+    <Filter Include="Source Files\gui\detail">
-      <UniqueIdentifier>{87b124cb-408d-460b-a81b-8a788bbae0d9}</UniqueIdentifier>
+      <UniqueIdentifier>{b9f9a5a8-fd1a-4b99-b530-d8a4c45e62ec}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\gui\widgets\skeletons">
+    <Filter Include="Source Files\gui\widgets">
-      <UniqueIdentifier>{b10db2f1-0542-421a-9e1d-4357e3be5f68}</UniqueIdentifier>
+      <UniqueIdentifier>{4b04c197-4a1e-41f9-bfa3-d82c18bcad51}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\paint">
+    <Filter Include="Source Files\gui\detail\win32">
-      <UniqueIdentifier>{59f186c8-f5f8-4499-8e19-f278d4754220}</UniqueIdentifier>
+      <UniqueIdentifier>{cd6e7f3f-fe5b-44c6-ae8d-15554f926055}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\paint\detail">
+    <Filter Include="Source Files\gui\widgets\skeletons">
-      <UniqueIdentifier>{5acf1733-47b2-4872-a105-66c7ad15cd39}</UniqueIdentifier>
+      <UniqueIdentifier>{60f588f2-bdb9-4b1d-9e23-40a73f327283}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\nana\system">
+    <Filter Include="Source Files\paint\detail">
-      <UniqueIdentifier>{a81fa10e-1274-44e0-92a0-434fa28f89ae}</UniqueIdentifier>
+      <UniqueIdentifier>{53feb93f-2b86-4bf5-b2f3-f60ef1bbbf76}</UniqueIdentifier>
    </Filter>
    <Filter Include="Source Files\nana\threads">
      <UniqueIdentifier>{e95b4a72-643f-4416-af95-b0bbaf7f0c57}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\source\audio\detail\audio_device.cpp">
      <Filter>Source Files\nana\audio\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\audio\detail\audio_stream.cpp">
      <Filter>Source Files\nana\audio\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\audio\detail\buffer_preparation.cpp">
      <Filter>Source Files\nana\audio\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\audio\player.cpp">
      <Filter>Source Files\nana\audio</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\detail\win32\platform_spec.cpp">
      <Filter>Source Files\nana\detail\win32</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\filesystem\file_iterator.cpp">
      <Filter>Source Files\nana\filesystem</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\filesystem\fs_utility.cpp">
      <Filter>Source Files\nana\filesystem</Filter>
    </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">
      <Filter>Source Files\nana\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\drawer.cpp">
      <Filter>Source Files\nana\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\native_window_interface.cpp">
      <Filter>Source Files\nana\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\window_manager.cpp">
      <Filter>Source Files\nana\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\skeletons\text_editor.cpp">
      <Filter>Source Files\nana\gui\widgets\skeletons</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\button.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\categorize.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\checkbox.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\combox.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\date_chooser.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\float_listbox.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\form.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\frame.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\label.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\listbox.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\menu.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\menubar.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\panel.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\picture.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\progress.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\scroll.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\slider.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\tabbar.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\textbox.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\toolbar.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\treebox.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\widget.cpp">
      <Filter>Source Files\nana\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\animation.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\basis.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\dragger.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\drawing.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\effects.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\element.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\filebox.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\layout_utility.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\msgbox.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\place.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\programming_interface.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\timer.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\tooltip.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\wvl.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\detail\image_process_provider.cpp">
      <Filter>Source Files\nana\paint\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\detail\native_paint_interface.cpp">
      <Filter>Source Files\nana\paint\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\gadget.cpp">
      <Filter>Source Files\nana\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\graphics.cpp">
      <Filter>Source Files\nana\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\image.cpp">
      <Filter>Source Files\nana\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\image_process_selector.cpp">
      <Filter>Source Files\nana\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\pixel_buffer.cpp">
      <Filter>Source Files\nana\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\text_renderer.cpp">
      <Filter>Source Files\nana\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\system\dataexch.cpp">
      <Filter>Source Files\nana\system</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\system\platform.cpp">
      <Filter>Source Files\nana\system</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\system\shared_wrapper.cpp">
      <Filter>Source Files\nana\system</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\system\timepiece.cpp">
      <Filter>Source Files\nana\system</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\threads\pool.cpp">
      <Filter>Source Files\nana\threads</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\any.cpp">
-      <Filter>Source Files\nana</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\basic_types.cpp">
-      <Filter>Source Files\nana</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\charset.cpp">
-      <Filter>Source Files\nana</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\datetime.cpp">
-      <Filter>Source Files\nana</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\deploy.cpp">
-      <Filter>Source Files\nana</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\exceptions.cpp">
-      <Filter>Source Files\nana</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\traits.cpp">
      <Filter>Source Files\nana</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\unicode_bidi.cpp">
      <Filter>Source Files\nana</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\window_layout.cpp">
      <Filter>Source Files\nana\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\element_store.cpp">
      <Filter>Source Files\nana\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\bedrock_pi.cpp">
      <Filter>Source Files\nana\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\events_operation.cpp">
      <Filter>Source Files\nana\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\notifier.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\state_cursor.cpp">
      <Filter>Source Files\nana\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\internationalization.cpp">
-      <Filter>Source Files\nana</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\source\gui\detail\color_schemes.cpp">
+    <ClCompile Include="..\..\source\traits.cpp">
-      <Filter>Source Files\nana\gui\detail</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\source\gui\screen.cpp">
+    <ClCompile Include="..\..\source\unicode_bidi.cpp">
-      <Filter>Source Files\nana\gui</Filter>
+      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\source\gui\widgets\spinbox.cpp">
+    <ClCompile Include="..\..\source\audio\detail\audio_device.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
+      <Filter>Source Files\audio\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\audio\detail\audio_stream.cpp">
      <Filter>Source Files\audio\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\audio\detail\buffer_preparation.cpp">
      <Filter>Source Files\audio\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\audio\player.cpp">
      <Filter>Source Files\audio</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\detail\win32\platform_spec.cpp">
      <Filter>Source Files\detail\win32</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\filesystem\file_iterator.cpp">
      <Filter>Source Files\filesystem</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\filesystem\filesystem.cpp">
-      <Filter>Source Files\nana\filesystem</Filter>
+      <Filter>Source Files\filesystem</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\filesystem\fs_utility.cpp">
      <Filter>Source Files\filesystem</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\basic_window.cpp">
      <Filter>Source Files\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\bedrock_pi.cpp">
      <Filter>Source Files\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\color_schemes.cpp">
      <Filter>Source Files\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\drawer.cpp">
      <Filter>Source Files\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\element_store.cpp">
      <Filter>Source Files\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\events_operation.cpp">
      <Filter>Source Files\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\native_window_interface.cpp">
      <Filter>Source Files\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\window_layout.cpp">
      <Filter>Source Files\gui\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\detail\window_manager.cpp">
      <Filter>Source Files\gui\detail</Filter>
    </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">
      <Filter>Source Files\gui\widgets\skeletons</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\button.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\categorize.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\checkbox.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\combox.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\date_chooser.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\float_listbox.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\form.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\frame.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\group.cpp">
-      <Filter>Source Files\nana\gui\widgets</Filter>
+      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\label.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\listbox.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\menu.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\menubar.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\panel.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\picture.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\progress.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\scroll.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\slider.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\spinbox.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\tabbar.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\textbox.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\toolbar.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\treebox.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\widgets\widget.cpp">
      <Filter>Source Files\gui\widgets</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\animation.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\basis.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\dragger.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\drawing.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\effects.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\element.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\filebox.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\layout_utility.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\msgbox.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\notifier.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\place.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\programming_interface.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\screen.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\state_cursor.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\timer.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\tooltip.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\gui\wvl.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\threads\pool.cpp">
      <Filter>Source Files\threads</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\system\dataexch.cpp">
      <Filter>Source Files\system</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\system\platform.cpp">
      <Filter>Source Files\system</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\system\timepiece.cpp">
      <Filter>Source Files\system</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\detail\image_process_provider.cpp">
      <Filter>Source Files\paint\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\detail\native_paint_interface.cpp">
      <Filter>Source Files\paint\detail</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\graphics.cpp">
      <Filter>Source Files\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\image.cpp">
      <Filter>Source Files\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\image_process_selector.cpp">
      <Filter>Source Files\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\pixel_buffer.cpp">
      <Filter>Source Files\paint</Filter>
    </ClCompile>
    <ClCompile Include="..\..\source\paint\text_renderer.cpp">
      <Filter>Source Files\paint</Filter>
    </ClCompile>
  </ItemGroup>
 </Project>
--- a/extrlib/readme
+++ b/extrlib/readme
@ -1 +0,0 @@
 The libpng.a is for MinGW(Not linux), and other .lib files are for VS2013
--- 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/
--- 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 <nana/paint/gadget.hpp>	//deprecated
 #include <nana/gui/timer.hpp>
 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<unsigned>(range() - 1));
 		}
 	};//end class scroll
 }//end namespace nana
--- 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 <nana/pat/cloneable.hpp>
 #include <nana/any.hpp>
@ -30,7 +29,7 @@ namespace nana
 		T & value;
 		arg_tabbar(tabbar<T>& wdg, T& v)
-			: widget{ wdg }, value{ v }
+			: widget(wdg), value{ v }
 		{}
 	};
--- 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 <nana/paint/gadget.hpp>	//deprecated
 #include "detail/tree_cont.hpp"
 #include <nana/gui/timer.hpp>
 #include <nana/any.hpp>
--- a/include/nana/paint/gadget.hpp
+++ b/include/nana/paint/gadget.hpp
@ -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 <nana/basic_types.hpp>
 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
--- a/include/nana/pat/cloneable.hpp
+++ b/include/nana/pat/cloneable.hpp
@ -21,75 +21,6 @@ namespace nana{ namespace pat{
 	namespace detail
 	{
 		/*
 		template<typename T>
 		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<typename T, typename SuperOfT>
 		class cloneable_wrapper
 			: public cloneable_interface<SuperOfT>	//deprecated
 		{
 		public:
 			using value_type = T;
 			using interface_t = typename cloneable_interface<SuperOfT>::interface_t;
 			cloneable_wrapper() = default;
 			cloneable_wrapper(const value_type& obj)
 				:object_(obj)
 			{}
 			cloneable_wrapper(value_type&& rv)
 				:object_(std::move(rv))
 			{}
 			template<typename U>
 			cloneable_wrapper(const U& u)
 				: object_(u)
 			{}
 			template<typename U>
 			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<interface_t>* 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<typename U>
 			cloneable_wrapper(const U& u)	//deprecated
 				: object_(u)
 			{}
 			template<typename U>
 			cloneable_wrapper(U&& u)
 				: object_(std::move(u))
 			{}
 			*/
 		private:
 			//Implement cloneable_interface
 			virtual void* get() override
--- 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<HWND>(wd), WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(h_big_icon));
 				}
 				if (h_small_icon) {
 					::SendMessage(reinterpret_cast<HWND>(wd), WM_SETICON, ICON_SMALL, reinterpret_cast<WPARAM>(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)
--- 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<color_rgb>((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<element::provider::factory_interface<element_type>>;	//deprecated
+		using factory_interface = pat::cloneable<element::detail::factory_abstract>;
 		//using factory_interface = pat::cloneable<element::detail::factory_abstract>;
 	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<element_type*>(static_cast<element::provider::factory_interface<element_type>&>(*factory_).create());
 			//element_ptr_ = static_cast<element_type*>(static_cast<element::provider::factory_interface<element_type>&>(*factory_).create());
 			if(nullptr == factory_ || nullptr == element_ptr_)
 			{
@ -647,14 +645,6 @@ namespace nana
 	class element_manager
 		: nana::noncopyable, nana::nonmovable
 	{
 		/*
 		template<typename ElementInterface>	//deprecated
 		struct item
 		{
 			element_object<ElementInterface> * employee;
 			std::map<std::string, std::shared_ptr<element_object<ElementInterface>>> table;
 		};
 		*/
 		template<typename ElementInterface>
 		struct item
 		{
--- 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<int>(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<int>(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<unsigned>(month));
 			auto day = impl->wdg_day.to_int();
 			impl->wdg_day.range(1, days, 1); //It resets the current value of wdg_day
--- a/source/gui/place.cpp
+++ b/source/gui/place.cpp
@ -24,6 +24,8 @@
 #include <memory>
 #include <limits>	//numeric_limits
 #include <cstdlib>	//std::abs
 #include <cstring>	//std::memset
 #include "place_parts.hpp"
@ -93,7 +95,13 @@ namespace nana
 			std::string pos_str() const
 			{
 #ifdef NANA_MINGW
 				std::stringstream ss;
 				ss<<pos();
 				return ss.str();
 #else
 				return std::to_string(pos());
 #endif // NANA_MINGW
 			}
 			token read()
@ -731,7 +739,7 @@ namespace nana
 						return child.get();
 			}
 			return nullptr;
-		
+
 		}
 	public:
 		void _m_visible_for_child(division * div, bool vsb)
@ -1397,7 +1405,6 @@ namespace nana
 					else if (left_px < 0)
 						left_px = 0;
 					auto leaf_left = _m_leaf_left();
 					double imd_rate = 100.0 / area_px;
 					left_px = static_cast<int>(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<void(implement::division*)> 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);
--- a/source/gui/widgets/categorize.cpp
+++ b/source/gui/widgets/categorize.cpp
@ -14,7 +14,6 @@
 #include <nana/gui/widgets/categorize.hpp>
 #include <nana/gui/widgets/float_listbox.hpp>
 #include <nana/gui/element.hpp>
 //#include <nana/paint/gadget.hpp>	//deprecated
 #include <nana/gui/widgets/detail/tree_cont.hpp>
 #include <stdexcept>
--- a/source/gui/widgets/checkbox.cpp
+++ b/source/gui/widgets/checkbox.cpp
@ -11,7 +11,6 @@
 */
 #include <nana/gui/widgets/checkbox.hpp>
 //#include <nana/paint/gadget.hpp>	//deprecated
 #include <nana/paint/text_renderer.hpp>
 #include <nana/gui/element.hpp>
 #include <algorithm>
--- a/source/gui/widgets/date_chooser.cpp
+++ b/source/gui/widgets/date_chooser.cpp
@ -12,7 +12,6 @@
 #include <nana/gui/widgets/date_chooser.hpp>
 #include <nana/gui/element.hpp>
 //#include <nana/paint/gadget.hpp>	//deprecated
 #include <nana/system/platform.hpp>
 #include <sstream>
--- a/source/gui/widgets/menu.cpp
+++ b/source/gui/widgets/menu.cpp
@ -12,7 +12,6 @@
 #include <nana/gui/widgets/menu.hpp>
 #include <nana/system/platform.hpp>
 #include <nana/paint/gadget.hpp>
 #include <nana/gui/element.hpp>
 #include <nana/gui/wvl.hpp>
 #include <nana/paint/text_renderer.hpp>
--- 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<decltype(caret.y)>(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<decltype(caret.x)>(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<decltype(caret.x)>(lnsz);
 					changed = true;
 				}
 				break;
--- a/source/gui/widgets/tabbar.cpp
+++ b/source/gui/widgets/tabbar.cpp
@ -97,7 +97,7 @@ namespace nana
 				{
 					int x = r.x + (static_cast<int>(r.width) - 14) / 2;
 					int y = r.y + (static_cast<int>(r.height) - 14) / 2;
-					
+
 					::nana::color clr;
 					switch(sta)
@ -114,12 +114,10 @@ namespace nana
 					graph.rectangle(r, true, bgcolor_);
 					facade<element::cross> 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<element::x_icon> x_icon;
 					x_icon.draw(graph, {}, colors::black, { r.x + static_cast<int>(r.width - 16) / 2, r.y + static_cast<int>(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<element::x_icon> x_icon;
 					x_icon.draw(graph, {}, colors::black, { r.x + static_cast<int>(r.width - 16) / 2, r.y + static_cast<int>(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<item>& items)
 					{
 						const auto height_px = graph.height();
 						std::vector<unsigned> pxs;
 						unsigned pixels = 0;
--- a/source/paint/gadget.cpp
+++ b/source/paint/gadget.cpp
@ -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 <nana/paint/graphics.hpp>
 #include <nana/paint/gadget.hpp>
 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
--- 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<DWORD>(imageBytes);
 				HANDLE hFile = ::CreateFileW(static_cast<std::wstring>(::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<DWORD>(imageBytes), &dwWrite, nullptr);
 				::CloseHandle(hFile);
 				::DeleteObject(hBmp);
		`@ -1 +0,0 @@`
			`The libpng.a is for MinGW(Not linux), and other .lib files are for VS2013`
`@ -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/`	`You can download the precompiled external libraries at http://sourceforge.net/projects/nanapro/files/extrlib/`