small changes
This commit is contained in:
parent
7f12b76e08
commit
85c2bdbd75
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* A CheckBox Implementation
|
* A CheckBox Implementation
|
||||||
* Nana C++ Library(http://www.nanapro.org)
|
* Nana C++ Library(http://www.nanapro.org)
|
||||||
* Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com)
|
* Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com)
|
||||||
*
|
*
|
||||||
* Distributed under the Boost Software License, Version 1.0.
|
* Distributed under the Boost Software License, Version 1.0.
|
||||||
* (See accompanying file LICENSE_1_0.txt or copy at
|
* (See accompanying file LICENSE_1_0.txt or copy at
|
||||||
|
|||||||
@ -6197,8 +6197,8 @@ namespace nana
|
|||||||
for(size_type i=first_col; i<=last_col; ++i) new_idx.push_back(i);
|
for(size_type i=first_col; i<=last_col; ++i) new_idx.push_back(i);
|
||||||
|
|
||||||
internal_scope_guard lock;
|
internal_scope_guard lock;
|
||||||
const item_proxy ip_row = this->at(row);
|
auto ip_row = this->at(row);
|
||||||
const nana::any *pnany=_m_ess().lister.anyobj(row,false);
|
auto pnany=_m_ess().lister.anyobj(row,false);
|
||||||
std::sort(new_idx.begin(), new_idx.end(), [&](size_type col1,
|
std::sort(new_idx.begin(), new_idx.end(), [&](size_type col1,
|
||||||
size_type col2)
|
size_type col2)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* A Spin box widget
|
* A Spin box widget
|
||||||
* Nana C++ Library(http://www.nanapro.org)
|
* Nana C++ Library(http://www.nanapro.org)
|
||||||
* Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com)
|
* Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com)
|
||||||
*
|
*
|
||||||
* Distributed under the Boost Software License, Version 1.0.
|
* Distributed under the Boost Software License, Version 1.0.
|
||||||
* (See accompanying file LICENSE_1_0.txt or copy at
|
* (See accompanying file LICENSE_1_0.txt or copy at
|
||||||
|
|||||||
@ -1966,6 +1966,8 @@ namespace nana
|
|||||||
|
|
||||||
void trigger::detached()
|
void trigger::detached()
|
||||||
{
|
{
|
||||||
|
//Reset the comp_placer, because after deteching, the scheme refered by comp_placer will be released
|
||||||
|
impl_->data.comp_placer.reset();
|
||||||
impl_->data.graph = nullptr;
|
impl_->data.graph = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user