Merge remote-tracking branch 'cnjinhao/develop-1.8' into dev_dpi_system

# Conflicts:
#	include/nana/gui/detail/bedrock.hpp
#	include/nana/gui/drawing.hpp
#	include/nana/gui/screen.hpp
#	include/nana/gui/widgets/button.hpp
#	include/nana/gui/widgets/form.hpp
#	include/nana/gui/widgets/listbox.hpp
#	include/nana/gui/widgets/treebox.hpp
#	include/nana/gui/widgets/widget.hpp
#	include/nana/paint/graphics.hpp
#	include/nana/paint/pixel_buffer.hpp
#	source/detail/platform_abstraction.hpp
#	source/gui/detail/basic_window.cpp
#	source/gui/detail/basic_window.hpp
#	source/gui/detail/bedrock_pi.cpp
#	source/gui/detail/inner_fwd_implement.hpp
#	source/gui/detail/window_manager.cpp
#	source/gui/drawing.cpp
#	source/gui/place.cpp
#	source/gui/place_parts.hpp
#	source/gui/screen.cpp
#	source/gui/widgets/menu.cpp
#	source/gui/widgets/menubar.cpp
#	source/gui/widgets/skeletons/content_view.cpp
#	source/gui/widgets/treebox.cpp
#	source/paint/detail/native_paint_interface.cpp
#	source/paint/graphics.cpp

include/nana/basic_types.hpp

@@ -1,6 +1,6 @@
 /**
  *	Basic Types definition
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2024 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0. 

include/nana/c++defines.hpp

@@ -1,6 +1,6 @@
 /**
  *	Predefined Symbols for C++
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2016-2020 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/charset.hpp

@@ -1,6 +1,6 @@
 /**
  *	The charset Implementation
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2020 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/config.hpp

@@ -1,6 +1,6 @@
 /**
  *	Nana Configuration
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2023 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/deploy.hpp

@@ -1,6 +1,6 @@
 /**
  *	The Deploy Implementation
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2020 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/filesystem/filesystem_ext.hpp

@@ -1,5 +1,5 @@
 /**
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2019 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/fwd.hpp

@@ -1,6 +1,6 @@
 /*
  *	Forward Declarations
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2015 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui.hpp

@@ -1,6 +1,6 @@
 /**
  *	Nana GUI Header
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2019 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.
@@ -18,7 +18,9 @@
 #include "gui/compact.hpp"
 #include "gui/screen.hpp"
 #include "gui/widgets/form.hpp"
+#ifndef NANA_DRAWING_REMOVED
 #include "gui/drawing.hpp"
+#endif
 #include "gui/msgbox.hpp"
 #include "gui/place.hpp"
 

include/nana/gui/animation.hpp

@@ -1,6 +1,6 @@
 /*
  *	An Animation Implementation
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2020 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.
@@ -21,9 +21,11 @@
 
 namespace nana
 {
-	class animation;
+	class [[deprecated("Deprecated in 1.8")]] animation;
         /// Holds the frames and frame builders. Have reference semantics for efficiency.
-	class frameset
+
+
+	class [[deprecated("Deprecated in 1.8")]] frameset
 	{
 		friend class animation;
 	public:
@@ -38,7 +40,7 @@ namespace nana
 		std::shared_ptr<impl> impl_;
 	};
             /// Easy way to display an animation or create an animated GUI
-	class animation
+	class [[deprecated("Deprecated in 1.8")]] animation
 	{
 		struct branch_t
 		{

include/nana/gui/basis.hpp

@@ -1,6 +1,6 @@
 /**
  *	Basis Implementation
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2024 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/compact.hpp

@@ -1,6 +1,6 @@
 /**
  *	Nana GUI Library Definition
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2019 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/bedrock.hpp

@@ -1,7 +1,7 @@
 /**
  *	A Bedrock Implementation
- *	Nana C++ Library(http://www.nanapro.org)
- *	Copyright(C) 2003-2024 Jinhao([email protected])
+ *	Nana C++ Library(https://nana.acemind.cn)
+ *	Copyright(C) 2003-2023 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.
  *	(See accompanying file LICENSE_1_0.txt or copy at

include/nana/gui/detail/color_schemes.hpp

@@ -1,6 +1,6 @@
 /*
 *	Color Schemes
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2020 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/drawer.hpp

@@ -1,6 +1,6 @@
 /*
  *	A Drawer Implementation
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2017 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0. 
@@ -152,9 +152,14 @@ namespace nana
 			void attached(widget&, drawer_trigger&);
 			drawer_trigger* detached();
 		public:
+			std::function<void(paint::graphics&)> drawing() const;
+			void drawing(std::function<void(paint::graphics&)>&&);
+
+#ifndef NANA_DRAWING_REMOVED
 			void clear();
 			void* draw(std::function<void(paint::graphics&)> &&, bool diehard);
 			void erase(void* diehard);
+#endif
 		private:
 			void _m_effect_bground_subsequent();
 			method_state& _m_mth_state(int pos);

include/nana/gui/detail/element_store.hpp

@@ -1,6 +1,6 @@
 /*
 *	The Store for the Storage Of Elements
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2016 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/event_code.hpp

@@ -1,6 +1,6 @@
 /*
 *	Definitions of General Events Code
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2016 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/general_events.hpp

@@ -1,6 +1,6 @@
 /**
 *	Definition of General Events
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2020 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/inner_fwd.hpp

@@ -1,6 +1,6 @@
 /*
 *	Inner Forward Declaration
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2015 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/internal_scope_guard.hpp

@@ -1,6 +1,6 @@
 /*
 *	Forward Declaration of Internal Scope Guard
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2020 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/native_window_interface.hpp

@@ -1,6 +1,6 @@
 /**
  *	Platform Implementation
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2024 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0. 

include/nana/gui/detail/virtual_keyboard.hpp

@@ -1,6 +1,6 @@
 /*
 *	Virtual Keyboard Implementations
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2024 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/widget_content_measurer_interface.hpp

@@ -1,6 +1,6 @@
 /*
 *	Widget Content Measurer Interface
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2020 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/widget_geometrics.hpp

@@ -1,6 +1,6 @@
 /*
 *	Widget Geometrics
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2018 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/widget_notifier_interface.hpp

@@ -1,6 +1,6 @@
 /*
  *	Widget Notifier Interface
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2015 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/detail/window_manager.hpp

@@ -1,6 +1,6 @@
 /**
  *	Window Manager Implementation
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2022 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/dragdrop.hpp

@@ -1,6 +1,6 @@
 /**
 *	Drag and Drop Implementation
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2018-2019 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/dragger.hpp

@@ -1,6 +1,6 @@
 /*
 *	A Dragger Implementation
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2016 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/drawing.hpp

@@ -1,14 +1,17 @@
 /**
  *	A Drawing Implementation
- *	Nana C++ Library(http://www.nanapro.org)
- *	Copyright(C) 2003-2024 Jinhao([email protected])
+ *	Nana C++ Library(https://nana.acemind.cn)
+ *	Copyright(C) 2003-2014 Jinhao([email protected])
  *
  *	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/gui/drawing.hpp
  */
+
+#ifndef NANA_DRAWING_REMOVED
+
 #ifndef NANA_GUI_DRAWING_HPP
 #define NANA_GUI_DRAWING_HPP
 
@@ -21,7 +24,7 @@ namespace nana
 	/// \brief Draw pictures on a widget by specifying a drawing method that will be employed every time the widget refreshes. 
     /// By the end of drawing, the picture may not be displayed immediately. 
     /// If a picture need to be displayed immediately call nana::gui::api::refresh_window() .
-	class drawing
+	class [[deprecated("Deprecated in 1.8, please use widget::drawing instead")]] drawing
 		:private nana::noncopyable
 	{
 		struct draw_fn_handle;
@@ -53,3 +56,5 @@ namespace nana
 
 #include <nana/pop_ignore_diagnostic>
 #endif
+
+#endif //NANA_DRAWING_REMOVED

include/nana/gui/element.hpp

@@ -1,6 +1,6 @@
 /*
  *	Elements of GUI Gadgets
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2016 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0. 

include/nana/gui/filebox.hpp

@@ -1,6 +1,6 @@
 /**
  *	Filebox
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2020 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/layout_utility.hpp

@@ -1,6 +1,6 @@
 /*
  *	Utility Implementation
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2015 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0. 

include/nana/gui/msgbox.hpp

@@ -1,6 +1,6 @@
 /**
 *	A Message Box Class
-*	Nana C++ Library(http://www.nanapro.org)
+*	Nana C++ Library(https://nana.acemind.cn)
 *	Copyright(C) 2003-2019 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/notifier.hpp

@@ -1,6 +1,6 @@
 /*
  *	Definition of Notifier
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2020 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/place.hpp

@@ -1,6 +1,6 @@
 /**
  *	An Implementation of Place for Layout
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2020 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/programming_interface.hpp

@@ -1,6 +1,6 @@
 /**
  *	Nana GUI Programming Interface Implementation
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2024 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.
@@ -536,6 +536,9 @@ namespace api
 	/// Configures the numeric keyboard. It returns true if virtual keyboard is enabled and
 	/// the specified window is a text editor window, false otherwise.
 	bool keyboard_numeric(window, bool padding);
+
+	std::function<void(paint::graphics&)> drawing(window);
+	void drawing(window, std::function<void(paint::graphics&)>);
 }//end namespace api
 
 namespace API = api;

include/nana/gui/screen.hpp

@@ -1,7 +1,7 @@
 /**
 *	Screen Informations
-*	Nana C++ Library(http://www.nanapro.org)
-*	Copyright(C) 2003-2024 Jinhao([email protected])
+*	Nana C++ Library(https://nana.acemind.cn)
+*	Copyright(C) 2003-2015 Jinhao([email protected])
 *
 *	Distributed under the Boost Software License, Version 1.0.
 *	(See accompanying file LICENSE_1_0.txt or copy at

include/nana/gui/state_cursor.hpp

@@ -1,6 +1,6 @@
 /*
  *	State Cursor
- *	Nana C++ Library(http://www.nanapro.org)
+ *	Nana C++ Library(https://nana.acemind.cn)
  *	Copyright(C) 2003-2014 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0.

include/nana/gui/widgets/button.hpp

@@ -1,9 +1,7 @@
 /**
  *	A Button Implementation
- *	Nana C++ Library 
- *  Documentation https://nana.acemind.cn/documentation
- *  Sources: https://github.com/cnjinhao/nana
- *	Copyright(C) 2003-2024 Jinhao([email protected])
+ *	Nana C++ Library(https://nana.acemind.cn)
+ *	Copyright(C) 2003-2021 Jinhao([email protected])
  *
  *	Distributed under the Boost Software License, Version 1.0. 
  *	(See accompanying file LICENSE_1_0.txt or copy at