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

10
source/gui/widgets/listbox.cpp
View File

@@ -549,9 +549,9 @@ namespace nana
if (!front) view++;
if (view >= cont_.size() ) return;
auto i = std::find_if( cont_.begin(),
cont_.end(),
[&](const column& c){return col==c.index;});
auto i = std::find_if( cont_.begin(),
cont_.end(),
[&](const column& c){return col==c.index;});
if (i==cont_.end()) return;
@@ -4474,7 +4474,7 @@ namespace nana
essence_->stop_mouse_selection();
need_refresh = true;
}
if (operation_states::msup_deselect == essence_->operation.state)
{
essence_->operation.state = operation_states::none;
@@ -6193,7 +6193,7 @@ namespace nana
std::vector<size_type> new_idx;
for(size_type i=first_col; i<=last_col; ++i) new_idx.push_back(i);
internal_scope_guard lock;
auto ip_row = this->at(row);
auto pnany=_m_ess().lister.anyobj(row,false);