diff --git a/include/nana/basic_types.hpp b/include/nana/basic_types.hpp index a79895500..35c04db69 100644 --- a/include/nana/basic_types.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/c++defines.hpp b/include/nana/c++defines.hpp index 450ef3ddd..91678ae40 100644 --- a/include/nana/c++defines.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/charset.hpp b/include/nana/charset.hpp index 56469a5b5..6dfe0d939 100644 --- a/include/nana/charset.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/config.hpp b/include/nana/config.hpp index 408f825fb..c8503dcca 100644 --- a/include/nana/config.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/deploy.hpp b/include/nana/deploy.hpp index a587f57eb..ed30f0c08 100644 --- a/include/nana/deploy.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/filesystem/filesystem_ext.hpp b/include/nana/filesystem/filesystem_ext.hpp index ed330cffc..a7f2cb544 100644 --- a/include/nana/filesystem/filesystem_ext.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/fwd.hpp b/include/nana/fwd.hpp index c3795e3ae..83c6f285f 100644 --- a/include/nana/fwd.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui.hpp b/include/nana/gui.hpp index 09c2f7b9a..af3d99f65 100644 --- a/include/nana/gui.hpp +++ b/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(cnjinhao@hotmail.com) * * 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" diff --git a/include/nana/gui/animation.hpp b/include/nana/gui/animation.hpp index bf318e1c0..3a7cfcb04 100644 --- a/include/nana/gui/animation.hpp +++ b/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(cnjinhao@hotmail.com) * * 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_; }; /// Easy way to display an animation or create an animated GUI - class animation + class [[deprecated("Deprecated in 1.8")]] animation { struct branch_t { diff --git a/include/nana/gui/basis.hpp b/include/nana/gui/basis.hpp index 999d65199..a5b65916b 100644 --- a/include/nana/gui/basis.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/compact.hpp b/include/nana/gui/compact.hpp index c4a9789a8..9a3ab1390 100644 --- a/include/nana/gui/compact.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/bedrock.hpp b/include/nana/gui/detail/bedrock.hpp index 0650f2c55..5563b838d 100644 --- a/include/nana/gui/detail/bedrock.hpp +++ b/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(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2023 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/nana/gui/detail/color_schemes.hpp b/include/nana/gui/detail/color_schemes.hpp index f647ffeb3..00925c454 100644 --- a/include/nana/gui/detail/color_schemes.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/drawer.hpp b/include/nana/gui/detail/drawer.hpp index 40c55e7d4..768afe426 100644 --- a/include/nana/gui/detail/drawer.hpp +++ b/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(cnjinhao@hotmail.com) * * 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 drawing() const; + void drawing(std::function&&); + +#ifndef NANA_DRAWING_REMOVED void clear(); void* draw(std::function &&, bool diehard); void erase(void* diehard); +#endif private: void _m_effect_bground_subsequent(); method_state& _m_mth_state(int pos); diff --git a/include/nana/gui/detail/element_store.hpp b/include/nana/gui/detail/element_store.hpp index 72df9fbb6..a3ed2d0b2 100644 --- a/include/nana/gui/detail/element_store.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/event_code.hpp b/include/nana/gui/detail/event_code.hpp index a9802e4a0..10afc73b1 100644 --- a/include/nana/gui/detail/event_code.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/general_events.hpp b/include/nana/gui/detail/general_events.hpp index 7cbd546c7..2eb0e1e84 100644 --- a/include/nana/gui/detail/general_events.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/inner_fwd.hpp b/include/nana/gui/detail/inner_fwd.hpp index ffe18a52e..bf2a243e2 100644 --- a/include/nana/gui/detail/inner_fwd.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/internal_scope_guard.hpp b/include/nana/gui/detail/internal_scope_guard.hpp index 22d376c28..147f55df9 100644 --- a/include/nana/gui/detail/internal_scope_guard.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/native_window_interface.hpp b/include/nana/gui/detail/native_window_interface.hpp index ec67fd7f8..7bf832387 100644 --- a/include/nana/gui/detail/native_window_interface.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/virtual_keyboard.hpp b/include/nana/gui/detail/virtual_keyboard.hpp index 7dc709eff..b5cb651b8 100644 --- a/include/nana/gui/detail/virtual_keyboard.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/widget_content_measurer_interface.hpp b/include/nana/gui/detail/widget_content_measurer_interface.hpp index 4db9ef2ba..3074cee2a 100644 --- a/include/nana/gui/detail/widget_content_measurer_interface.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/widget_geometrics.hpp b/include/nana/gui/detail/widget_geometrics.hpp index 91cdff6cc..05d5402ea 100644 --- a/include/nana/gui/detail/widget_geometrics.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/widget_notifier_interface.hpp b/include/nana/gui/detail/widget_notifier_interface.hpp index 81a0a28f3..11622b9cf 100644 --- a/include/nana/gui/detail/widget_notifier_interface.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/detail/window_manager.hpp b/include/nana/gui/detail/window_manager.hpp index a9c66cfa8..987f9fab3 100644 --- a/include/nana/gui/detail/window_manager.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/dragdrop.hpp b/include/nana/gui/dragdrop.hpp index e1362f2f6..06e993fbb 100644 --- a/include/nana/gui/dragdrop.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/dragger.hpp b/include/nana/gui/dragger.hpp index 9e6bbbf24..29c67427e 100644 --- a/include/nana/gui/dragger.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/drawing.hpp b/include/nana/gui/drawing.hpp index ffa035fff..36aa67675 100644 --- a/include/nana/gui/drawing.hpp +++ b/include/nana/gui/drawing.hpp @@ -1,7 +1,7 @@ /** * A Drawing Implementation - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at @@ -9,6 +9,9 @@ * * @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 #endif + +#endif //NANA_DRAWING_REMOVED \ No newline at end of file diff --git a/include/nana/gui/element.hpp b/include/nana/gui/element.hpp index bb76656da..a2cfa6e9f 100644 --- a/include/nana/gui/element.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/filebox.hpp b/include/nana/gui/filebox.hpp index 33acd42b3..80e0bf7e8 100644 --- a/include/nana/gui/filebox.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/layout_utility.hpp b/include/nana/gui/layout_utility.hpp index fdadf0361..42dd885ff 100644 --- a/include/nana/gui/layout_utility.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/msgbox.hpp b/include/nana/gui/msgbox.hpp index 30e02fca4..a14cef32b 100644 --- a/include/nana/gui/msgbox.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/notifier.hpp b/include/nana/gui/notifier.hpp index d5a734f64..83fe9afc7 100644 --- a/include/nana/gui/notifier.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/place.hpp b/include/nana/gui/place.hpp index cc5af8e48..9b5eb9770 100644 --- a/include/nana/gui/place.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/programming_interface.hpp b/include/nana/gui/programming_interface.hpp index 846e11a9e..25dea1119 100644 --- a/include/nana/gui/programming_interface.hpp +++ b/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(cnjinhao@hotmail.com) * * 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 drawing(window); + void drawing(window, std::function); }//end namespace api namespace API = api; diff --git a/include/nana/gui/screen.hpp b/include/nana/gui/screen.hpp index 6a06d6a07..6b712ff53 100644 --- a/include/nana/gui/screen.hpp +++ b/include/nana/gui/screen.hpp @@ -1,7 +1,7 @@ /** * Screen Informations -* Nana C++ Library(http://www.nanapro.org) -* Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) +* Nana C++ Library(https://nana.acemind.cn) +* 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 diff --git a/include/nana/gui/state_cursor.hpp b/include/nana/gui/state_cursor.hpp index 139b621c0..9e6eab78e 100644 --- a/include/nana/gui/state_cursor.hpp +++ b/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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/button.hpp b/include/nana/gui/widgets/button.hpp index 26a497548..f689bb402 100644 --- a/include/nana/gui/widgets/button.hpp +++ b/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(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/nana/gui/widgets/categorize.hpp b/include/nana/gui/widgets/categorize.hpp index 624a8e4eb..f7db14d10 100644 --- a/include/nana/gui/widgets/categorize.hpp +++ b/include/nana/gui/widgets/categorize.hpp @@ -1,6 +1,6 @@ /** * A Categorize Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/checkbox.hpp b/include/nana/gui/widgets/checkbox.hpp index 0b96c475f..1aabbd1e8 100644 --- a/include/nana/gui/widgets/checkbox.hpp +++ b/include/nana/gui/widgets/checkbox.hpp @@ -1,6 +1,6 @@ /** * A CheckBox Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/combox.hpp b/include/nana/gui/widgets/combox.hpp index 139a0ee88..d8f0a740b 100644 --- a/include/nana/gui/widgets/combox.hpp +++ b/include/nana/gui/widgets/combox.hpp @@ -1,6 +1,6 @@ /** * A Combox Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/date_chooser.hpp b/include/nana/gui/widgets/date_chooser.hpp index b732d4215..39d75f00e 100644 --- a/include/nana/gui/widgets/date_chooser.hpp +++ b/include/nana/gui/widgets/date_chooser.hpp @@ -1,6 +1,6 @@ /** * A date chooser Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/detail/inline_widget.hpp b/include/nana/gui/widgets/detail/inline_widget.hpp index 875c2945f..7fb91d315 100644 --- a/include/nana/gui/widgets/detail/inline_widget.hpp +++ b/include/nana/gui/widgets/detail/inline_widget.hpp @@ -1,6 +1,6 @@ /** * A Inline Widget Interface Definition - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/detail/inline_widget_manager.hpp b/include/nana/gui/widgets/detail/inline_widget_manager.hpp index ef5ec65bc..530acffe1 100644 --- a/include/nana/gui/widgets/detail/inline_widget_manager.hpp +++ b/include/nana/gui/widgets/detail/inline_widget_manager.hpp @@ -1,6 +1,6 @@ /** * A Inline Widget Manager Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/float_listbox.hpp b/include/nana/gui/widgets/float_listbox.hpp index 2fe244bf6..b5f8d6134 100644 --- a/include/nana/gui/widgets/float_listbox.hpp +++ b/include/nana/gui/widgets/float_listbox.hpp @@ -1,6 +1,6 @@ /** * A float_listbox Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/form.hpp b/include/nana/gui/widgets/form.hpp index 288b124d5..50d0eeb7b 100644 --- a/include/nana/gui/widgets/form.hpp +++ b/include/nana/gui/widgets/form.hpp @@ -1,9 +1,7 @@ /** * A Form Implementation - * Nana C++ Library - * Documentation https://nana.acemind.cn/documentation - * Sources: https://github.com/cnjinhao/nana - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/nana/gui/widgets/label.hpp b/include/nana/gui/widgets/label.hpp index 26880130e..8f83ae17e 100644 --- a/include/nana/gui/widgets/label.hpp +++ b/include/nana/gui/widgets/label.hpp @@ -1,6 +1,6 @@ /** * A Label Control Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/listbox.hpp b/include/nana/gui/widgets/listbox.hpp index cdaa036ba..b4bfb9b7f 100644 --- a/include/nana/gui/widgets/listbox.hpp +++ b/include/nana/gui/widgets/listbox.hpp @@ -1,8 +1,6 @@ /** * A List Box Implementation - * Nana C++ Library - * Documentation https://nana.acemind.cn/documentation - * Sources: https://github.com/cnjinhao/nana + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/menu.hpp b/include/nana/gui/widgets/menu.hpp index fcad50d49..0cbdb7ed3 100644 --- a/include/nana/gui/widgets/menu.hpp +++ b/include/nana/gui/widgets/menu.hpp @@ -1,6 +1,6 @@ /** * A Menu implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2009-2017 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/menubar.hpp b/include/nana/gui/widgets/menubar.hpp index f60732a9d..27fdace8e 100644 --- a/include/nana/gui/widgets/menubar.hpp +++ b/include/nana/gui/widgets/menubar.hpp @@ -1,6 +1,6 @@ /* * A Menubar implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2009-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/picture.hpp b/include/nana/gui/widgets/picture.hpp index 699cd06c6..b59150be2 100644 --- a/include/nana/gui/widgets/picture.hpp +++ b/include/nana/gui/widgets/picture.hpp @@ -1,6 +1,6 @@ /** * A Picture Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/progress.hpp b/include/nana/gui/widgets/progress.hpp index 68b177c98..a2e636933 100644 --- a/include/nana/gui/widgets/progress.hpp +++ b/include/nana/gui/widgets/progress.hpp @@ -1,6 +1,6 @@ /** * A Progress Indicator Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/scroll.hpp b/include/nana/gui/widgets/scroll.hpp index 35e3769af..9b24d127e 100644 --- a/include/nana/gui/widgets/scroll.hpp +++ b/include/nana/gui/widgets/scroll.hpp @@ -1,6 +1,6 @@ /** * A Scroll Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/skeletons/text_editor.hpp b/include/nana/gui/widgets/skeletons/text_editor.hpp index 7b2ffdf88..abf1f2ecf 100644 --- a/include/nana/gui/widgets/skeletons/text_editor.hpp +++ b/include/nana/gui/widgets/skeletons/text_editor.hpp @@ -1,6 +1,6 @@ /* * A text editor implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/skeletons/text_token_stream.hpp b/include/nana/gui/widgets/skeletons/text_token_stream.hpp index 290427136..1dbc7afb5 100644 --- a/include/nana/gui/widgets/skeletons/text_token_stream.hpp +++ b/include/nana/gui/widgets/skeletons/text_token_stream.hpp @@ -1,6 +1,6 @@ /* * Text Token Stream - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/skeletons/textbase.hpp b/include/nana/gui/widgets/skeletons/textbase.hpp index 0eba2fdad..36f32c4f0 100644 --- a/include/nana/gui/widgets/skeletons/textbase.hpp +++ b/include/nana/gui/widgets/skeletons/textbase.hpp @@ -1,6 +1,6 @@ /* * A textbase class implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/skeletons/textbase_export_interface.hpp b/include/nana/gui/widgets/skeletons/textbase_export_interface.hpp index eeda5b459..14ff1c87c 100644 --- a/include/nana/gui/widgets/skeletons/textbase_export_interface.hpp +++ b/include/nana/gui/widgets/skeletons/textbase_export_interface.hpp @@ -1,6 +1,6 @@ /* * Definitions of textbase export interfaces - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/slider.hpp b/include/nana/gui/widgets/slider.hpp index 489c3e1f1..1cb2ac4a7 100644 --- a/include/nana/gui/widgets/slider.hpp +++ b/include/nana/gui/widgets/slider.hpp @@ -1,6 +1,6 @@ /** * A Slider Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/spinbox.hpp b/include/nana/gui/widgets/spinbox.hpp index fa6c25b36..d6169a885 100644 --- a/include/nana/gui/widgets/spinbox.hpp +++ b/include/nana/gui/widgets/spinbox.hpp @@ -1,6 +1,6 @@ /** * A Spin box widget - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/tabbar.hpp b/include/nana/gui/widgets/tabbar.hpp index 7a69b7fed..886d669e7 100644 --- a/include/nana/gui/widgets/tabbar.hpp +++ b/include/nana/gui/widgets/tabbar.hpp @@ -1,6 +1,6 @@ /** * A Tabbar implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/textbox.hpp b/include/nana/gui/widgets/textbox.hpp index f848eecac..286d0e8a7 100644 --- a/include/nana/gui/widgets/textbox.hpp +++ b/include/nana/gui/widgets/textbox.hpp @@ -1,6 +1,6 @@ /** * A Textbox Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/toolbar.hpp b/include/nana/gui/widgets/toolbar.hpp index ab4d110c3..9e4982853 100644 --- a/include/nana/gui/widgets/toolbar.hpp +++ b/include/nana/gui/widgets/toolbar.hpp @@ -1,6 +1,6 @@ /** * A Toolbar Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/gui/widgets/treebox.hpp b/include/nana/gui/widgets/treebox.hpp index 1fc31bb2a..9a2a20e2f 100644 --- a/include/nana/gui/widgets/treebox.hpp +++ b/include/nana/gui/widgets/treebox.hpp @@ -1,7 +1,7 @@ /** * A Tree Box Implementation - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE or copy at @@ -119,8 +119,6 @@ namespace nana std::string img_idstr; }; - struct pseudo_node_type{}; - using tree_cont_type = widgets::detail::tree_cont; using node_type = tree_cont_type::node_type; @@ -386,7 +384,7 @@ namespace nana }//end namespace drawerbase /// \brief Displays a hierarchical list of items, such as the files and directories on a disk. - /// See also in [documentation](http://nanapro.org/en-us/documentation/widgets/treebox.htm) + /// See also in [documentation](https://nana.acemind.cn/documentation) class treebox :public widget_object drawing() const; + void drawing(std::function); + protected: std::unique_ptr<::nana::detail::widget_notifier_interface> _m_wdg_notifier(); private: diff --git a/include/nana/internationalization.hpp b/include/nana/internationalization.hpp index fca0c4795..6ba4da94f 100644 --- a/include/nana/internationalization.hpp +++ b/include/nana/internationalization.hpp @@ -1,6 +1,6 @@ /* * An Implementation of i18n - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/key_type.hpp b/include/nana/key_type.hpp index 8d77edbd2..2d5e89d05 100644 --- a/include/nana/key_type.hpp +++ b/include/nana/key_type.hpp @@ -1,6 +1,6 @@ /* * A Key Implementation -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/paint/graphics.hpp b/include/nana/paint/graphics.hpp index 1240a3f06..bb24f6cb3 100644 --- a/include/nana/paint/graphics.hpp +++ b/include/nana/paint/graphics.hpp @@ -1,7 +1,7 @@ /** * Paint Graphics Implementation - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/nana/paint/image.hpp b/include/nana/paint/image.hpp index 5baf123be..4b2e55c97 100644 --- a/include/nana/paint/image.hpp +++ b/include/nana/paint/image.hpp @@ -1,6 +1,6 @@ /** * Paint Image Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/paint/pixel_buffer.hpp b/include/nana/paint/pixel_buffer.hpp index 00f693e67..246b43b66 100644 --- a/include/nana/paint/pixel_buffer.hpp +++ b/include/nana/paint/pixel_buffer.hpp @@ -1,7 +1,7 @@ /** * Pixel Buffer Implementation - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/nana/pat/abstract_factory.hpp b/include/nana/pat/abstract_factory.hpp index 9f23642e8..2d7a876c2 100644 --- a/include/nana/pat/abstract_factory.hpp +++ b/include/nana/pat/abstract_factory.hpp @@ -1,6 +1,6 @@ /* * A Generic Abstract Factory Pattern Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/pat/cloneable.hpp b/include/nana/pat/cloneable.hpp index d9af2bf4e..255e4956a 100644 --- a/include/nana/pat/cloneable.hpp +++ b/include/nana/pat/cloneable.hpp @@ -1,6 +1,6 @@ /* * A Generic Cloneable Pattern Implementation -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/include/nana/verbose_preprocessor.hpp b/include/nana/verbose_preprocessor.hpp index f8d4a4772..1d06c774b 100644 --- a/include/nana/verbose_preprocessor.hpp +++ b/include/nana/verbose_preprocessor.hpp @@ -1,6 +1,6 @@ /** * Nana Verbose preprocessor - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/basic_types.cpp b/source/basic_types.cpp index f1677dd70..3a454a0ee 100644 --- a/source/basic_types.cpp +++ b/source/basic_types.cpp @@ -1,6 +1,6 @@ /* * Basic Types definition - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/charset.cpp b/source/charset.cpp index 021a6701a..885e527a0 100644 --- a/source/charset.cpp +++ b/source/charset.cpp @@ -1,6 +1,6 @@ /** * A Character Encoding Set Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/deploy.cpp b/source/deploy.cpp index 6356c5001..8a10da6f3 100644 --- a/source/deploy.cpp +++ b/source/deploy.cpp @@ -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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/detail/mswin/platform_spec.hpp b/source/detail/mswin/platform_spec.hpp index adce10131..b46d12684 100644 --- a/source/detail/mswin/platform_spec.hpp +++ b/source/detail/mswin/platform_spec.hpp @@ -1,6 +1,6 @@ /** * Platform Specification Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/detail/platform_abstraction.hpp b/source/detail/platform_abstraction.hpp index 8832f64fe..0901ba2c7 100644 --- a/source/detail/platform_abstraction.hpp +++ b/source/detail/platform_abstraction.hpp @@ -1,9 +1,7 @@ /** * Platform Abstraction - * Nana C++ Library - * Documentation https://nana.acemind.cn/documentation - * Sources: https://github.com/cnjinhao/nana - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2017-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/source/detail/platform_spec_posix.cpp b/source/detail/platform_spec_posix.cpp index 02a3195e6..6ac2325f7 100644 --- a/source/detail/platform_spec_posix.cpp +++ b/source/detail/platform_spec_posix.cpp @@ -1,6 +1,6 @@ /* * Platform Specification Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Nana Software License, Version 1.0. diff --git a/source/detail/platform_spec_selector.hpp b/source/detail/platform_spec_selector.hpp index 865a50c41..581fd530e 100644 --- a/source/detail/platform_spec_selector.hpp +++ b/source/detail/platform_spec_selector.hpp @@ -1,6 +1,6 @@ /** * Selector of Platform Specification - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/detail/platform_spec_windows.cpp b/source/detail/platform_spec_windows.cpp index 0fc7d8bc1..307c64275 100644 --- a/source/detail/platform_spec_windows.cpp +++ b/source/detail/platform_spec_windows.cpp @@ -1,6 +1,6 @@ /** * Platform Specification Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/detail/posix/platform_spec.hpp b/source/detail/posix/platform_spec.hpp index 707cca31f..51245980d 100644 --- a/source/detail/posix/platform_spec.hpp +++ b/source/detail/posix/platform_spec.hpp @@ -1,6 +1,6 @@ /* * Platform Specification Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/detail/posix/xdnd_protocol.hpp b/source/detail/posix/xdnd_protocol.hpp index c5bb3719c..0b0250c02 100644 --- a/source/detail/posix/xdnd_protocol.hpp +++ b/source/detail/posix/xdnd_protocol.hpp @@ -1,6 +1,6 @@ /* * X-Window XDND Protocol Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2018-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/animation.cpp b/source/gui/animation.cpp index ccd514fd9..d58ef4b1f 100644 --- a/source/gui/animation.cpp +++ b/source/gui/animation.cpp @@ -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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. @@ -771,20 +771,6 @@ namespace nana } } - /* - void branch(const std::string& name, const frameset& frms) - { - impl_->branches[name].frames = frms; - } - - void branch(const std::string& name, const frameset& frms, std::function condition) - { - auto & br = impl_->branches[name]; - br.frames = frms; - br.condition = condition; - } - */ - void animation::looped(bool enable) { if(impl_->looped != enable) diff --git a/source/gui/basis.cpp b/source/gui/basis.cpp index e67428072..4cef89ff4 100644 --- a/source/gui/basis.cpp +++ b/source/gui/basis.cpp @@ -1,6 +1,6 @@ /* * Basis Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/detail/basic_window.cpp b/source/gui/detail/basic_window.cpp index b6aa2d3f1..d88f2a0ca 100644 --- a/source/gui/detail/basic_window.cpp +++ b/source/gui/detail/basic_window.cpp @@ -1,7 +1,7 @@ /** * A Basic Window Widget Definition -* Nana C++ Library(http://www.nanapro.org) -* Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) +* Nana C++ Library(https://nana.acemind.cn) +* Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/source/gui/detail/basic_window.hpp b/source/gui/detail/basic_window.hpp index ed9431fe5..c762a7818 100644 --- a/source/gui/detail/basic_window.hpp +++ b/source/gui/detail/basic_window.hpp @@ -1,9 +1,7 @@ /** * A Basic Window Widget Definition - * Nana C++ Library - * Documentation https://nana.acemind.cn/documentation - * Sources: https://github.com/cnjinhao/nana - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/source/gui/detail/bedrock_pi.cpp b/source/gui/detail/bedrock_pi.cpp index 71de925b5..3e6028c2e 100644 --- a/source/gui/detail/bedrock_pi.cpp +++ b/source/gui/detail/bedrock_pi.cpp @@ -1,7 +1,7 @@ /** * A Bedrock Platform-Independent Implementation -* Nana C++ Library(http://www.nanapro.org) -* Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) +* Nana C++ Library(https://nana.acemind.cn) +* Copyright(C) 2003-2023 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/source/gui/detail/bedrock_posix.cpp b/source/gui/detail/bedrock_posix.cpp index c749efb21..fc2bfe1bf 100644 --- a/source/gui/detail/bedrock_posix.cpp +++ b/source/gui/detail/bedrock_posix.cpp @@ -1,6 +1,6 @@ /* * A Bedrock Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/detail/bedrock_windows.cpp b/source/gui/detail/bedrock_windows.cpp index 4db5d3d20..489330482 100644 --- a/source/gui/detail/bedrock_windows.cpp +++ b/source/gui/detail/bedrock_windows.cpp @@ -1,6 +1,6 @@ /** * A Bedrock Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/detail/color_schemes.cpp b/source/gui/detail/color_schemes.cpp index 3bfea8dbe..ed105fb16 100644 --- a/source/gui/detail/color_schemes.cpp +++ b/source/gui/detail/color_schemes.cpp @@ -1,6 +1,6 @@ /* * Color Schemes -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/detail/drawer.cpp b/source/gui/detail/drawer.cpp index b7ba3bb84..ae6442e7c 100644 --- a/source/gui/detail/drawer.cpp +++ b/source/gui/detail/drawer.cpp @@ -1,7 +1,7 @@ /* * A Drawer Implementation - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at @@ -229,7 +229,11 @@ namespace nana drawer_trigger* realizer{ nullptr }; method_state mth_state[event_size]; + std::function draw; + +#ifndef NANA_DRAWING_REMOVED std::vector, bool>*> draws; //Drawing function and flag for clearable +#endif }; drawer::drawer(int dpi) @@ -239,8 +243,10 @@ namespace nana drawer::~drawer() { +#ifndef NANA_DRAWING_REMOVED for(auto p : data_impl_->draws) delete p; +#endif delete data_impl_; } @@ -419,11 +425,22 @@ namespace nana return nullptr; } + std::function drawer::drawing() const + { + return data_impl_->draw; + } + + void drawer::drawing(std::function&& fn) + { + data_impl_->draw = std::move(fn); + } + +#ifndef NANA_DRAWING_REMOVED void drawer::clear() { - for(auto i = data_impl_->draws.cbegin(); i != data_impl_->draws.cend();) + for (auto i = data_impl_->draws.cbegin(); i != data_impl_->draws.cend();) { - if((*i)->second) + if ((*i)->second) { delete (*i); i = data_impl_->draws.erase(i); @@ -456,13 +473,18 @@ namespace nana } } } - +#endif void drawer::_m_effect_bground_subsequent() { + if (data_impl_->draw) + data_impl_->draw(graphics); + auto & effect = data_impl_->window_handle->effect; +#ifndef NANA_DRAWING_REMOVED for (auto * dw : data_impl_->draws) dw->first(graphics); +#endif if (effect.bground) { diff --git a/source/gui/detail/effects_renderer.hpp b/source/gui/detail/effects_renderer.hpp index 99fbf49cf..e4f01c3d7 100644 --- a/source/gui/detail/effects_renderer.hpp +++ b/source/gui/detail/effects_renderer.hpp @@ -1,6 +1,6 @@ /* * Effects Renderer -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/detail/element_store.cpp b/source/gui/detail/element_store.cpp index 2a65a2427..27f0dd4e0 100644 --- a/source/gui/detail/element_store.cpp +++ b/source/gui/detail/element_store.cpp @@ -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-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/detail/inner_fwd_implement.hpp b/source/gui/detail/inner_fwd_implement.hpp index 857e27eac..06db82ac2 100644 --- a/source/gui/detail/inner_fwd_implement.hpp +++ b/source/gui/detail/inner_fwd_implement.hpp @@ -1,9 +1,7 @@ /** * Implementations of Inner Forward Declaration - * Nana C++ Library - * Documentation https://nana.acemind.cn/documentation - * Sources: https://github.com/cnjinhao/nana - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/source/gui/detail/keyboard_im.hpp b/source/gui/detail/keyboard_im.hpp index b55460a1e..c8018edc0 100644 --- a/source/gui/detail/keyboard_im.hpp +++ b/source/gui/detail/keyboard_im.hpp @@ -612,10 +612,10 @@ namespace nana::detail table[L"zong"] = L"从纵枞宗疭总昮倊倧從猔偬捴骔综惣腙棕葼焧惾堫搃揔揌嵕嵏猣碂蓗朡椶傯粽綜総緃稯嵸摠潀潈緵緫縂翪糉蝬踪潨踨熜熧樅燪縦瘲磫總鍐繌縱豵蹤鬃騌糭鬉鬷騣鯮鯼鑁"; table[L"zou"] = L"赱邹走驺奏陬诹郰菆掫揍棸鄒棷楱搊媰緅箃諏鄹鲰黀鯫騶齱齺"; table[L"zu"] = L"卆阻足诅卒怚组俎爼珇祖柤哫唨倅租崒族菹崪組椊葅詛稡蒩箤靻踤镞鎐鏃"; - table[L"zuan"] = L"钻揝鉆篹繤賺缵纂纉劗攥鑚躜纘籫躦鑽"; - table[L"zui"] = L"咀冣厜栬酔絊朘祽最晬辠觜罪睟稡槜酻嗺嶊蕞醉嘴嶵樶檇鋷錊噿檌濢璻蟕欈纗"; + table[L"zuan"] = L"钻攥躜揝鉆篹繤賺缵纂纉劗鑚纘籫躦鑽"; + table[L"zui"] = L"咀最罪醉嘴冣厜栬酔絊朘祽晬辠觜睟稡槜酻嗺嶊蕞嶵樶檇鋷錊噿檌濢璻蟕欈纗"; table[L"zun"] = L"拵捘栫袸尊僔銌遵墫撙嶟噂樽罇繜瀳譐鐏鳟鷷鱒"; - table[L"zuo"] = L"左作坐阼佐苲怍岝咗岞侳柮柞昨祚胙唑座秨袏莋笮做捽唶葄酢葃琢蓙稓筰鈼飵撮諎嘬穝繓糳"; + table[L"zuo"] = L"左作坐佐座做阼苲怍岝咗岞侳柮柞昨祚胙唑秨袏莋笮捽唶葄酢葃琢蓙稓筰鈼飵撮諎嘬穝繓糳"; //常用词组 diff --git a/source/gui/detail/native_window_interface.cpp b/source/gui/detail/native_window_interface.cpp index 8de0e4de4..8dd141503 100644 --- a/source/gui/detail/native_window_interface.cpp +++ b/source/gui/detail/native_window_interface.cpp @@ -1,6 +1,6 @@ /** * Platform Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/detail/virtual_keyboard.cpp b/source/gui/detail/virtual_keyboard.cpp index 8a3df758b..19a817c19 100644 --- a/source/gui/detail/virtual_keyboard.cpp +++ b/source/gui/detail/virtual_keyboard.cpp @@ -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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -76,7 +75,7 @@ namespace nana::detail _m_adjust_size(padding); - nana::drawing{ *this }.draw([this](nana::paint::graphics& graph) { + this->drawing([this](nana::paint::graphics& graph) { _m_render(graph); }); @@ -329,7 +328,7 @@ namespace nana::detail cntpart_.graph.make(r.dimension()); - nana::drawing{ *this }.draw([this](nana::paint::graphics& graph) { + this->drawing([this](nana::paint::graphics& graph) { _m_render(graph); }); diff --git a/source/gui/detail/window_layout.cpp b/source/gui/detail/window_layout.cpp index 63efea618..c105a9264 100644 --- a/source/gui/detail/window_layout.cpp +++ b/source/gui/detail/window_layout.cpp @@ -1,6 +1,6 @@ /** * Window Layout Implementation -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/detail/window_manager.cpp b/source/gui/detail/window_manager.cpp index 401d15e5c..697d84fdc 100644 --- a/source/gui/detail/window_manager.cpp +++ b/source/gui/detail/window_manager.cpp @@ -1,9 +1,7 @@ /** * Window Manager Implementation - * Nana C++ Library - * Documentation https://nana.acemind.cn/documentation - * Sources: https://github.com/cnjinhao/nana - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/source/gui/dragdrop.cpp b/source/gui/dragdrop.cpp index 8f3250b9b..0bb195c42 100644 --- a/source/gui/dragdrop.cpp +++ b/source/gui/dragdrop.cpp @@ -1,6 +1,6 @@ /** * Drag and Drop Implementation -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2019-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/dragger.cpp b/source/gui/dragger.cpp index b351eb2e0..4d16912de 100644 --- a/source/gui/dragger.cpp +++ b/source/gui/dragger.cpp @@ -1,6 +1,6 @@ /* * A Dragger Implementation -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/drawing.cpp b/source/gui/drawing.cpp index 660324835..e884e1686 100644 --- a/source/gui/drawing.cpp +++ b/source/gui/drawing.cpp @@ -1,7 +1,7 @@ /** * A Drawing Implementation - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * 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 @@ -10,6 +10,7 @@ * @file nana/gui/drawing.cpp */ +#ifndef NANA_DRAWING_REMOVED #include "detail/basic_window.hpp" #include #include @@ -92,3 +93,4 @@ namespace nana //end class drawing }//end namespace nana +#endif //NANA_DRAWING_REMOVED \ No newline at end of file diff --git a/source/gui/element.cpp b/source/gui/element.cpp index f8843971f..b99e964d6 100644 --- a/source/gui/element.cpp +++ b/source/gui/element.cpp @@ -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-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/filebox.cpp b/source/gui/filebox.cpp index 8a456f942..401db0c94 100644 --- a/source/gui/filebox.cpp +++ b/source/gui/filebox.cpp @@ -1,6 +1,6 @@ /* * Filebox -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. @@ -711,9 +711,7 @@ namespace nana { file_container_.clear(); - drawing dw{ls_file_}; - dw.clear(); - dw.draw([](paint::graphics& graph){ + drawing([](paint::graphics& graph){ std::string text = "Permission denied to access the directory"; auto txt_sz = graph.text_extent_size(text); auto sz = graph.size(); @@ -746,7 +744,7 @@ namespace nana void _m_list_fs() { - drawing{ls_file_}.clear(); + ls_file_.drawing({}); auto filter = filter_.caption(); ls_file_.auto_draw(false); diff --git a/source/gui/layout_utility.cpp b/source/gui/layout_utility.cpp index c195a2760..a69073ab5 100644 --- a/source/gui/layout_utility.cpp +++ b/source/gui/layout_utility.cpp @@ -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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/msgbox.cpp b/source/gui/msgbox.cpp index 9ff4631bb..3e734178d 100644 --- a/source/gui/msgbox.cpp +++ b/source/gui/msgbox.cpp @@ -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-2024 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. @@ -20,7 +20,6 @@ #include #include -#include #include #include #include @@ -53,8 +52,8 @@ namespace nana owner_(wd), pick_(msgbox::pick_yes) { this->caption(title); - drawing dw(*this); - dw.draw([this](paint::graphics& graph) + + this->drawing([this](paint::graphics& graph) { graph.rectangle(rectangle{0, 0, graph.width(), graph.height() - 50}, true, colors::white); if(ico_.empty() == false) diff --git a/source/gui/notifier.cpp b/source/gui/notifier.cpp index be53d0915..54ebc2d4e 100644 --- a/source/gui/notifier.cpp +++ b/source/gui/notifier.cpp @@ -1,6 +1,6 @@ /* * Implementation of Notifier - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/place.cpp b/source/gui/place.cpp index 19429d532..b2efacf32 100644 --- a/source/gui/place.cpp +++ b/source/gui/place.cpp @@ -1,7 +1,7 @@ /** * An Implementation of Place for Layout - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE or copy at @@ -31,7 +31,6 @@ #include #include #include -#include #include "place_parts.hpp" @@ -2188,8 +2187,8 @@ namespace nana { auto host_size = api::window_size(impl_ptr_->window_handle); indicator_.docker.reset(new form(impl_ptr_->window_handle, { static_cast(host_size.width) / 2 - 16, static_cast(host_size.height) / 2 - 16, 32, 32 }, form::appear::bald<>())); - drawing dw(indicator_.docker->handle()); - dw.draw([](paint::graphics& graph) + + indicator_.docker->drawing([](paint::graphics& graph) { graph.rectangle(false, colors::midnight_blue); graph.rectangle({ 1, 1, 30, 30 }, true, colors::light_sky_blue); @@ -2228,8 +2227,7 @@ namespace nana indicator_.dock_area.reset(new panel(impl_ptr_->window_handle, {}, false)); indicator_.dock_area->move(this->field_area); - ::nana::drawing dw(indicator_.dock_area->handle()); - dw.draw([this](paint::graphics& graph) + indicator_.dock_area->drawing([this](paint::graphics& graph) { indicator_.graph.paste(this->field_area, graph, 0, 0); diff --git a/source/gui/place_parts.hpp b/source/gui/place_parts.hpp index c4f3b7db7..10f20dd5c 100644 --- a/source/gui/place_parts.hpp +++ b/source/gui/place_parts.hpp @@ -1,7 +1,7 @@ /** * Parts of Class Place - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE or copy at @@ -362,8 +362,8 @@ namespace nana rectangle r{ pos() + move_pos, size() }; container_.reset(new form(host_window_, r.pare_off(-1), form::appear::bald())); - drawing dw(container_->handle()); - dw.draw([](paint::graphics& graph) + + drawing([](paint::graphics& graph) { graph.rectangle(false, colors::coral); }); diff --git a/source/gui/programming_interface.cpp b/source/gui/programming_interface.cpp index 4011b1e98..7c4a69435 100644 --- a/source/gui/programming_interface.cpp +++ b/source/gui/programming_interface.cpp @@ -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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. @@ -1765,8 +1765,27 @@ namespace api return restrict::bedrock.vkeyboard().numeric(wd, padding); #else (void)wd; + (void)padding; return false; #endif } + + std::function drawing(window wd) + { + internal_scope_guard lock; + if (!is_window(wd)) + return {}; + + return wd->drawer.drawing(); + } + + void drawing(window wd, std::function fn) + { + internal_scope_guard lock; + if (!is_window(wd)) + return; + + wd->drawer.drawing(std::move(fn)); + } }//end namespace api }//end namespace nana diff --git a/source/gui/screen.cpp b/source/gui/screen.cpp index 79e4d41eb..fac9d1ace 100644 --- a/source/gui/screen.cpp +++ b/source/gui/screen.cpp @@ -1,9 +1,7 @@ /** * Screen Informations - * Nana C++ Library - * Documentation https://nana.acemind.cn/documentation - * Sources: https://github.com/cnjinhao/nana - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * 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 diff --git a/source/gui/state_cursor.cpp b/source/gui/state_cursor.cpp index 817b6dec1..daf4a93e5 100644 --- a/source/gui/state_cursor.cpp +++ b/source/gui/state_cursor.cpp @@ -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(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/timer.cpp b/source/gui/timer.cpp index 201260f76..108950915 100644 --- a/source/gui/timer.cpp +++ b/source/gui/timer.cpp @@ -1,6 +1,6 @@ /* * A Timer Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/tooltip.cpp b/source/gui/tooltip.cpp index 0a1d3b127..b9a22be26 100644 --- a/source/gui/tooltip.cpp +++ b/source/gui/tooltip.cpp @@ -1,6 +1,6 @@ /* * A Tooltip Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. @@ -328,7 +328,7 @@ namespace nana void tooltip::set(window wd, const std::string& text) { internal_scope_guard lock; - if(false == api::empty_window(wd)) + if(api::is_window(wd)) ctrl::instance()->set(wd, text); } diff --git a/source/gui/widgets/button.cpp b/source/gui/widgets/button.cpp index ac4e9c64a..955225be0 100644 --- a/source/gui/widgets/button.cpp +++ b/source/gui/widgets/button.cpp @@ -1,6 +1,6 @@ /* * A Button Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/categorize.cpp b/source/gui/widgets/categorize.cpp index df942c682..487a13df5 100644 --- a/source/gui/widgets/categorize.cpp +++ b/source/gui/widgets/categorize.cpp @@ -1,6 +1,6 @@ /** * A Categorize Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/checkbox.cpp b/source/gui/widgets/checkbox.cpp index 3198b7a36..0734524ef 100644 --- a/source/gui/widgets/checkbox.cpp +++ b/source/gui/widgets/checkbox.cpp @@ -1,6 +1,6 @@ /* * A CheckBox Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/combox.cpp b/source/gui/widgets/combox.cpp index 19e603dce..a1aa34616 100644 --- a/source/gui/widgets/combox.cpp +++ b/source/gui/widgets/combox.cpp @@ -1,6 +1,6 @@ /* * A Combox Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/date_chooser.cpp b/source/gui/widgets/date_chooser.cpp index 4b785eef3..722ea9d74 100644 --- a/source/gui/widgets/date_chooser.cpp +++ b/source/gui/widgets/date_chooser.cpp @@ -1,6 +1,6 @@ /* * A date chooser Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/float_listbox.cpp b/source/gui/widgets/float_listbox.cpp index 3ed24a782..d0cfdf4f9 100644 --- a/source/gui/widgets/float_listbox.cpp +++ b/source/gui/widgets/float_listbox.cpp @@ -1,6 +1,6 @@ /* * A float_listbox Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/group.cpp b/source/gui/widgets/group.cpp index 6accf6aa9..cffc787ca 100644 --- a/source/gui/widgets/group.cpp +++ b/source/gui/widgets/group.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #define _THROW_IF_EMPTY()\ @@ -311,8 +310,6 @@ group::~group() this->bgcolor(pbg.blend(colors::black, 0.05)); - drawing dw(*this); - //When the group is resized, the drawing is called before moving the caption, but //the drawing of group requires the latest position of caption for gradual rectangle. //For the requirement, a move event handler is required for listening the change of caption's position. @@ -322,7 +319,7 @@ group::~group() }); // This drawing function is owner by the owner of dw (the outer panel of the group widget), not by dw !! - dw.draw([this](paint::graphics& graph) + drawing([this](paint::graphics& graph) { auto gap_px = impl_->gap - 1; diff --git a/source/gui/widgets/label.cpp b/source/gui/widgets/label.cpp index 1fb580b9d..be97ce298 100644 --- a/source/gui/widgets/label.cpp +++ b/source/gui/widgets/label.cpp @@ -1,6 +1,6 @@ /* * A Label Control Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/listbox.cpp b/source/gui/widgets/listbox.cpp index 4a846feb2..22b801d10 100644 --- a/source/gui/widgets/listbox.cpp +++ b/source/gui/widgets/listbox.cpp @@ -1,6 +1,6 @@ /* * A List Box Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/menu.cpp b/source/gui/widgets/menu.cpp index 64e1ba73f..b8fa1648f 100644 --- a/source/gui/widgets/menu.cpp +++ b/source/gui/widgets/menu.cpp @@ -1,13 +1,13 @@ -/* +/** * A Menu implementation -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2009-2022 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/gui/widgets/menu.cpp +* @file nana/gui/widgets/menu.cpp * @contributors: * kmribti(pr#102) * dankan1890(pr#158) diff --git a/source/gui/widgets/menubar.cpp b/source/gui/widgets/menubar.cpp index 2377cba3d..876a5d6a8 100644 --- a/source/gui/widgets/menubar.cpp +++ b/source/gui/widgets/menubar.cpp @@ -1,7 +1,7 @@ /** * A Menubar implementation -* Nana C++ Library(http://www.nanapro.org) -* Copyright(C) 2009-2024 Jinhao(cnjinhao@hotmail.com) +* Nana C++ Library(https://nana.acemind.cn) +* Copyright(C) 2009-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/source/gui/widgets/picture.cpp b/source/gui/widgets/picture.cpp index 5cf3c2d07..75b260be5 100644 --- a/source/gui/widgets/picture.cpp +++ b/source/gui/widgets/picture.cpp @@ -1,6 +1,6 @@ /* * A Picture Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/progress.cpp b/source/gui/widgets/progress.cpp index 0affbb571..83417dae5 100644 --- a/source/gui/widgets/progress.cpp +++ b/source/gui/widgets/progress.cpp @@ -231,7 +231,7 @@ namespace nana unsigned progress::value(unsigned val) { internal_scope_guard lock; - if(api::empty_window(this->handle()) == false) + if(api::is_window(this->handle())) return get_drawer_trigger().progress()->value(&val); return 0; } diff --git a/source/gui/widgets/scroll.cpp b/source/gui/widgets/scroll.cpp index efb714de2..697c0ac71 100644 --- a/source/gui/widgets/scroll.cpp +++ b/source/gui/widgets/scroll.cpp @@ -1,6 +1,6 @@ /* * A Scroll Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/skeletons/content_view.cpp b/source/gui/widgets/skeletons/content_view.cpp index 2d7e4c326..a045e0ed9 100644 --- a/source/gui/widgets/skeletons/content_view.cpp +++ b/source/gui/widgets/skeletons/content_view.cpp @@ -1,7 +1,7 @@ /** * A Content View Implementation -* Nana C++ Library(http://www.nanapro.org) -* Copyright(C) 2017-2024 Jinhao(cnjinhao@hotmail.com) +* Nana C++ Library(https://nana.acemind.cn) +* Copyright(C) 2017-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at @@ -90,7 +90,7 @@ namespace nana { auto const scroll = cv_scroll->scroll(arg.which); - if (scroll && (!api::empty_window(arg.window_handle))) + if (scroll && api::is_window(arg.window_handle)) { auto align_px = (scroll->value() % scroll->step()); if (align_px) diff --git a/source/gui/widgets/skeletons/content_view.hpp b/source/gui/widgets/skeletons/content_view.hpp index 63e996532..80ca51097 100644 --- a/source/gui/widgets/skeletons/content_view.hpp +++ b/source/gui/widgets/skeletons/content_view.hpp @@ -1,6 +1,6 @@ /* * A Content View Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2017-2018 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/skeletons/text_editor.cpp b/source/gui/widgets/skeletons/text_editor.cpp index 7f96239a2..2aa7bdea3 100644 --- a/source/gui/widgets/skeletons/text_editor.cpp +++ b/source/gui/widgets/skeletons/text_editor.cpp @@ -1,6 +1,6 @@ /** * A text editor implementation -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/slider.cpp b/source/gui/widgets/slider.cpp index 319e2377e..a12a924a2 100644 --- a/source/gui/widgets/slider.cpp +++ b/source/gui/widgets/slider.cpp @@ -1,6 +1,6 @@ /** * A Slider Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/spinbox.cpp b/source/gui/widgets/spinbox.cpp index e0d23cf03..51ed2212e 100644 --- a/source/gui/widgets/spinbox.cpp +++ b/source/gui/widgets/spinbox.cpp @@ -1,6 +1,6 @@ /* * A Spin box widget - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/textbox.cpp b/source/gui/widgets/textbox.cpp index 6f3ec0ea8..0200962e1 100644 --- a/source/gui/widgets/textbox.cpp +++ b/source/gui/widgets/textbox.cpp @@ -1,6 +1,6 @@ /* * A Textbox Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/toolbar.cpp b/source/gui/widgets/toolbar.cpp index 6810cba81..65ee9bdc1 100644 --- a/source/gui/widgets/toolbar.cpp +++ b/source/gui/widgets/toolbar.cpp @@ -1,6 +1,6 @@ /* * A Toolbar Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/gui/widgets/treebox.cpp b/source/gui/widgets/treebox.cpp index 905cd319a..c947b8305 100644 --- a/source/gui/widgets/treebox.cpp +++ b/source/gui/widgets/treebox.cpp @@ -1,6 +1,6 @@ /* * A Treebox Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. @@ -845,6 +845,8 @@ namespace nana bool set_selected_multi(node_type* node, bool crtl, bool shift) { + (void)shift; + if (crtl) { data.stop_drawing = true; @@ -956,7 +958,7 @@ namespace nana if(node_state.selected != node) { data.stop_drawing = true; - if ((node_state.selected && single_selection) || node == nullptr) + if ((node_state.selected && single_selection) || !node) { auto nodes_copy = node_state.nodes_selected; node_state.clear(); diff --git a/source/gui/widgets/widget.cpp b/source/gui/widgets/widget.cpp index b844ad810..51d33d415 100644 --- a/source/gui/widgets/widget.cpp +++ b/source/gui/widgets/widget.cpp @@ -291,6 +291,16 @@ namespace nana return handle(); } + std::function widget::drawing() const + { + return api::drawing(handle()); + } + + void widget::drawing(std::function draw_fn) + { + api::drawing(handle(), std::move(draw_fn)); + } + std::unique_ptr<::nana::detail::widget_notifier_interface> widget::_m_wdg_notifier() { return std::unique_ptr<::nana::detail::widget_notifier_interface>(new inner_widget_notifier(*this)); diff --git a/source/internationalization.cpp b/source/internationalization.cpp index d3437da1f..b63b1058c 100644 --- a/source/internationalization.cpp +++ b/source/internationalization.cpp @@ -1,6 +1,6 @@ /* * An Implementation of i18n -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/paint/detail/image_bmp.hpp b/source/paint/detail/image_bmp.hpp index 3c5a16905..4b4259a92 100644 --- a/source/paint/detail/image_bmp.hpp +++ b/source/paint/detail/image_bmp.hpp @@ -1,6 +1,6 @@ /* * Bitmap Format Graphics Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/paint/detail/image_gif.hpp b/source/paint/detail/image_gif.hpp index 03fc19b45..eb1b02001 100644 --- a/source/paint/detail/image_gif.hpp +++ b/source/paint/detail/image_gif.hpp @@ -1,6 +1,6 @@ /* * GIF Format Graphics Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/paint/detail/image_ico_resource.hpp b/source/paint/detail/image_ico_resource.hpp index 2ee91dadc..c64db1ac6 100644 --- a/source/paint/detail/image_ico_resource.hpp +++ b/source/paint/detail/image_ico_resource.hpp @@ -1,6 +1,6 @@ /* * Icon Resource - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2017-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/paint/detail/image_pixbuf.hpp b/source/paint/detail/image_pixbuf.hpp index 8dd2cc80a..f0dc26646 100644 --- a/source/paint/detail/image_pixbuf.hpp +++ b/source/paint/detail/image_pixbuf.hpp @@ -1,6 +1,6 @@ /* * Basic Image PixelBuffer Implementation -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/paint/detail/image_processor.hpp b/source/paint/detail/image_processor.hpp index 21cde26e2..46658823c 100644 --- a/source/paint/detail/image_processor.hpp +++ b/source/paint/detail/image_processor.hpp @@ -1,6 +1,6 @@ /* * Image Processor Algorithm Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/paint/detail/native_paint_interface.cpp b/source/paint/detail/native_paint_interface.cpp index c65b132f3..7312a1b83 100644 --- a/source/paint/detail/native_paint_interface.cpp +++ b/source/paint/detail/native_paint_interface.cpp @@ -1,7 +1,7 @@ /** * Platform Implementation - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/source/paint/graphics.cpp b/source/paint/graphics.cpp index a4339abce..98170b7a5 100644 --- a/source/paint/graphics.cpp +++ b/source/paint/graphics.cpp @@ -1,7 +1,7 @@ /** * Paint Graphics Implementation - * Nana C++ Library(http://www.nanapro.org) - * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) + * Nana C++ Library(https://nana.acemind.cn) + * Copyright(C) 2003-2022 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at diff --git a/source/paint/image.cpp b/source/paint/image.cpp index 7ce2afc14..24f250337 100644 --- a/source/paint/image.cpp +++ b/source/paint/image.cpp @@ -1,6 +1,6 @@ /** * Paint Image Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2021 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/paint/image_accessor.hpp b/source/paint/image_accessor.hpp index 73060e7e2..7bc22f99b 100644 --- a/source/paint/image_accessor.hpp +++ b/source/paint/image_accessor.hpp @@ -1,6 +1,6 @@ /* * Paint Image Accessor -* Nana C++ Library(http://www.nanapro.org) +* Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/paint/pixel_buffer.cpp b/source/paint/pixel_buffer.cpp index b8b312d3c..4d625b257 100644 --- a/source/paint/pixel_buffer.cpp +++ b/source/paint/pixel_buffer.cpp @@ -1,6 +1,6 @@ /** * Pixel Buffer Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2024 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/system/split_string.hpp b/source/system/split_string.hpp index 1512ef41b..6663585d4 100644 --- a/source/system/split_string.hpp +++ b/source/system/split_string.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-2018 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. diff --git a/source/unicode_bidi.cpp b/source/unicode_bidi.cpp index b2c69f26a..b3c67d1fc 100644 --- a/source/unicode_bidi.cpp +++ b/source/unicode_bidi.cpp @@ -1,6 +1,6 @@ /* * Unicode Bidi-Language Implementation - * Nana C++ Library(http://www.nanapro.org) + * Nana C++ Library(https://nana.acemind.cn) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0.