Skip to content

Commit a9398c1

Browse files
qPCR4virqPCR4vir
committed
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
2 parents 91f6329 + b98d54f commit a9398c1

File tree

150 files changed

+275
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+275
-240
lines changed

‎include/nana/basic_types.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Basic Types definition
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2024 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/c++defines.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Predefined Symbols for C++
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2016-2020 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/charset.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The charset Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2020 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/config.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Nana Configuration
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2023 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/deploy.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* The Deploy Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2020 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/filesystem/filesystem_ext.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Nana C++ Library(http://www.nanapro.org)
2+
* Nana C++ Library(https://nana.acemind.cn)
33
* Copyright(C) 2003-2019 Jinhao([email protected])
44
*
55
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/fwd.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Forward Declarations
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2015 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Nana GUI Header
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2019 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.
@@ -18,7 +18,9 @@
1818
#include "gui/compact.hpp"
1919
#include "gui/screen.hpp"
2020
#include "gui/widgets/form.hpp"
21+
#ifndef NANA_DRAWING_REMOVED
2122
#include "gui/drawing.hpp"
23+
#endif
2224
#include "gui/msgbox.hpp"
2325
#include "gui/place.hpp"
2426

‎include/nana/gui/animation.hpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* An Animation Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2020 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.
@@ -21,9 +21,11 @@
2121

2222
namespace nana
2323
{
24-
class animation;
24+
class [[deprecated("Deprecated in 1.8")]] animation;
2525
/// Holds the frames and frame builders. Have reference semantics for efficiency.
26-
class frameset
26+
27+
28+
class [[deprecated("Deprecated in 1.8")]] frameset
2729
{
2830
friend class animation;
2931
public:
@@ -38,7 +40,7 @@ namespace nana
3840
std::shared_ptr<impl> impl_;
3941
};
4042
/// Easy way to display an animation or create an animated GUI
41-
class animation
43+
class [[deprecated("Deprecated in 1.8")]] animation
4244
{
4345
struct branch_t
4446
{

‎include/nana/gui/basis.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Basis Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2024 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/compact.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Nana GUI Library Definition
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2019 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/detail/bedrock.hpp

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

‎include/nana/gui/detail/color_schemes.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Color Schemes
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2020 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/detail/drawer.hpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* A Drawer Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2017 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.
@@ -152,9 +152,14 @@ namespace nana
152152
void attached(widget&, drawer_trigger&);
153153
drawer_trigger* detached();
154154
public:
155+
std::function<void(paint::graphics&)> drawing() const;
156+
void drawing(std::function<void(paint::graphics&)>&&);
157+
158+
#ifndef NANA_DRAWING_REMOVED
155159
void clear();
156160
void* draw(std::function<void(paint::graphics&)> &&, bool diehard);
157161
void erase(void* diehard);
162+
#endif
158163
private:
159164
void _m_effect_bground_subsequent();
160165
method_state& _m_mth_state(int pos);

‎include/nana/gui/detail/element_store.hpp

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

‎include/nana/gui/detail/event_code.hpp

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

‎include/nana/gui/detail/general_events.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Definition of General Events
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2020 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/detail/inner_fwd.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Inner Forward Declaration
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2015 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/detail/internal_scope_guard.hpp

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

‎include/nana/gui/detail/native_window_interface.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Platform Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2024 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/detail/virtual_keyboard.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Virtual Keyboard Implementations
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2024 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/detail/widget_content_measurer_interface.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Widget Content Measurer Interface
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2020 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/detail/widget_geometrics.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Widget Geometrics
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2018 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/detail/widget_notifier_interface.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Widget Notifier Interface
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2015 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/detail/window_manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Window Manager Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2022 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/dragdrop.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Drag and Drop Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2018-2019 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/dragger.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* A Dragger Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2016 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/drawing.hpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
/**
22
* A Drawing Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
4-
* Copyright(C) 2003-2024 Jinhao([email protected])
3+
* Nana C++ Library(https://nana.acemind.cn)
4+
* Copyright(C) 2003-2014 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.
77
* (See accompanying file LICENSE_1_0.txt or copy at
88
* http://www.boost.org/LICENSE_1_0.txt)
99
*
1010
* @file nana/gui/drawing.hpp
1111
*/
12+
13+
#ifndef NANA_DRAWING_REMOVED
14+
1215
#ifndef NANA_GUI_DRAWING_HPP
1316
#define NANA_GUI_DRAWING_HPP
1417

@@ -21,7 +24,7 @@ namespace nana
2124
/// \brief Draw pictures on a widget by specifying a drawing method that will be employed every time the widget refreshes.
2225
/// By the end of drawing, the picture may not be displayed immediately.
2326
/// If a picture need to be displayed immediately call nana::gui::api::refresh_window() .
24-
class drawing
27+
class [[deprecated("Deprecated in 1.8, please use widget::drawing instead")]] drawing
2528
:private nana::noncopyable
2629
{
2730
struct draw_fn_handle;
@@ -53,3 +56,5 @@ namespace nana
5356

5457
#include <nana/pop_ignore_diagnostic>
5558
#endif
59+
60+
#endif //NANA_DRAWING_REMOVED

‎include/nana/gui/element.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Elements of GUI Gadgets
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2016 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/filebox.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Filebox
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2020 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/layout_utility.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Utility Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2015 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/msgbox.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* A Message Box Class
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2019 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/notifier.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Definition of Notifier
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2020 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/place.hpp

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

‎include/nana/gui/programming_interface.hpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Nana GUI Programming Interface Implementation
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2024 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.
@@ -536,6 +536,9 @@ namespace api
536536
/// Configures the numeric keyboard. It returns true if virtual keyboard is enabled and
537537
/// the specified window is a text editor window, false otherwise.
538538
bool keyboard_numeric(window, bool padding);
539+
540+
std::function<void(paint::graphics&)> drawing(window);
541+
void drawing(window, std::function<void(paint::graphics&)>);
539542
}//end namespace api
540543

541544
namespace API = api;

‎include/nana/gui/screen.hpp

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

‎include/nana/gui/state_cursor.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* State Cursor
3-
* Nana C++ Library(http://www.nanapro.org)
3+
* Nana C++ Library(https://nana.acemind.cn)
44
* Copyright(C) 2003-2014 Jinhao([email protected])
55
*
66
* Distributed under the Boost Software License, Version 1.0.

‎include/nana/gui/widgets/button.hpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
/**
22
* A Button Implementation
3-
* Nana C++ Library
4-
* Documentation https://nana.acemind.cn/documentation
5-
* Sources: https://github.com/cnjinhao/nana
6-
* Copyright(C) 2003-2024 Jinhao([email protected])
3+
* Nana C++ Library(https://nana.acemind.cn)
4+
* Copyright(C) 2003-2021 Jinhao([email protected])
75
*
86
* Distributed under the Boost Software License, Version 1.0.
97
* (See accompanying file LICENSE_1_0.txt or copy at

0 commit comments

Comments
 (0)