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

fix: to_nstring in tabbar

Browse Source
This commit is contained in:
qPCR4vir 2016-02-16 12:58:35 +01:00
parent 186be4a99b
commit b9b749832e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,7 +261,8 @@ namespace nana
return this->get_drawer_trigger().length(); return this->get_drawer_trigger().length();
} }
tabbar& append(std::string text, window attach_wd, value_type value = {}) /// Append a new tab
tabbar& append(std::string text, window attach_wd, value_type value = {}) // 2x text convertion. maybe better to duplicate code?
{ {
return this->append( static_cast<std::wstring&&>(nana::charset(std::move(text), nana::unicode::utf8)), attach_wd, std::move(value)); return this->append( static_cast<std::wstring&&>(nana::charset(std::move(text), nana::unicode::utf8)), attach_wd, std::move(value));
} }
@ -271,7 +272,7 @@ namespace nana
if (attach_wd && API::empty_window(attach_wd)) if (attach_wd && API::empty_window(attach_wd))
throw std::invalid_argument("Appening a tab to a tabbar - error: tabbar.attach: invalid window handle"); throw std::invalid_argument("Appening a tab to a tabbar - error: tabbar.attach: invalid window handle");
this->get_drawer_trigger().insert(::nana::npos, std::move(text), std::move(value)); this->get_drawer_trigger().insert(::nana::npos, to_nstring(std::move(text)), std::move(value));
if (attach_wd) if (attach_wd)
this->attach(this->get_drawer_trigger().length() - 1, attach_wd); this->attach(this->get_drawer_trigger().length() - 1, attach_wd);