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

Merge branch 'develop' into prepare-utf8

Browse Source
This commit is contained in:
Jinhao
2016-01-03 14:18:03 +08:00
parent 0a4f04267e cd5a0bf554
commit 0bb7c788d5
13 changed files with 522 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,12 +58,12 @@ namespace nana
cell::cell(std::string text, const format& fmt)
: text(std::move(text)),
custom_format(new format{ fmt }) //make_unique
custom_format(std::make_unique<format>( fmt )) // or custom_format(new format{ fmt })
{}
cell::cell(std::string text, const ::nana::color& bgcolor, const ::nana::color& fgcolor)
: text(std::move(text)),
custom_format{ new format{ bgcolor, fgcolor } } //make_unique
custom_format{std::make_unique<format>( bgcolor, fgcolor ) } //custom_format{ new format{ bgcolor, fgcolor } }
{}
cell& cell::operator=(const cell& rhs)