mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge

Browse Source 
# Conflicts:
#	include/nana/gui/widgets/treebox.hpp
#	source/gui/place.cpp
This commit is contained in:
qPCR4vir
2019-05-05 22:15:41 +02:00
parent d6088e5d7d
commit ca96a9d3ca
8 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/nana/gui/dragdrop.hpp
View File

@@ -40,7 +40,16 @@ namespace nana
simple_dragdrop(simple_dragdrop&&) = delete;
simple_dragdrop& operator=(simple_dragdrop&&) = delete;
public:
simple_dragdrop(window source);
explicit simple_dragdrop(window source);
simple_dragdrop(window drag_origin,
std::function<bool()> when,
window drop_target,
std::function<void()> how)
: simple_dragdrop{drag_origin}
{
condition(when);
make_drop(drop_target, how);
}
~simple_dragdrop();
/// Condition checker

5
include/nana/gui/widgets/group.hpp
View File

@@ -59,9 +59,8 @@ namespace nana{
group(window parent, const rectangle& = {}, bool visible = true);
/// The construction that creates the widget and set the title or caption
group(window parent, ///< a handle to the parent
::std::string title, ///< caption of the group
group(window parent, ///< a handle to the parent
::std::string title, ///< caption of the group
bool formatted = false, ///< Enable/disable the formatted text for the title
unsigned gap = 2, ///< between the content and the external limit
const rectangle& r = {} ,

2
include/nana/gui/widgets/listbox.hpp
View File

@@ -1465,7 +1465,7 @@ the nana::detail::basic_window member pointer scheme
size_type column_size() const;
/// Move column to view_position
void move_column(size_type abs_pos, size_type view_pos);
void move_column(size_type abs_pos, size_type view_pos);
/// Sort columns in range first_col to last_col inclusive using the values from a row
void reorder_columns(size_type first_col,

4
include/nana/gui/widgets/treebox.hpp
View File

@@ -350,9 +350,9 @@ namespace nana
/// \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)
class treebox
:public widget_object < category::widget_tag,
:public widget_object <category::widget_tag,
drawerbase::treebox::trigger,
drawerbase::treebox::treebox_events>
drawerbase::treebox::treebox_events, drawerbase::treebox::scheme>
{
public:
/// A type refers to the item and is also used to iterate through the nodes.