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

fix a bug that listbox::cat_proxy::append<T> throws if model enabled

Browse Source
This commit is contained in:
Jinhao
2016-07-31 04:11:39 +08:00
parent 34cca34773
commit df5a786965
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -972,6 +972,7 @@ namespace nana
if (catobj.model_ptr) if (catobj.model_ptr)
{ {
throw_if_immutable_model(catobj.model_ptr.get());
auto container = catobj.model_ptr->container(); auto container = catobj.model_ptr->container();
std::size_t item_index; std::size_t item_index;
// //
@@ -5027,9 +5028,24 @@ namespace nana
internal_scope_guard lock; internal_scope_guard lock;
cat_->sorted.push_back(cat_->items.size()); if (cat_->model_ptr)
cells.resize(columns()); {
cat_->items.emplace_back(std::move(cells)); es_lister::throw_if_immutable_model(cat_->model_ptr.get());
auto container = cat_->model_ptr->container();
auto item_index = container->size();
cat_->items.emplace_back();
container->emplace_back();
container->assign(item_index, cells);
}
else
{
cat_->sorted.push_back(cat_->items.size());
cells.resize(columns());
cat_->items.emplace_back(std::move(cells));
}
assign_colors_for_last(ess_, cat_); assign_colors_for_last(ess_, cat_);
} }