Merge branch 'hotfix-1.5.6' of https://github.com/5cript/nana into 5cript-hotfix-1.5.6

This commit is contained in:
Jinhao 2018-01-22 06:13:23 +08:00
commit a62e872ded

View File

@ -276,7 +276,7 @@ namespace nana
this->get_drawer_trigger().insert(::nana::npos, to_nstring(std::move(text)), std::move(value));
if (attach_wd)
this->attach(this->get_drawer_trigger().length() - 1, attach_wd);
API::update_window(*this);
return *this;
}
@ -292,7 +292,7 @@ namespace nana
if (pos > length())
throw std::out_of_range("tabbar::insert invalid position");
this->get_drawer_trigger().insert(pos, to_nstring(text), std::move(value));
this->get_drawer_trigger().insert(pos, to_nstring(std::move(text)), std::move(value));
API::update_window(*this);
}
@ -305,7 +305,7 @@ namespace nana
API::update_window(*this);
}
/// Attach a window to a specified tab. When the tab is activated, tabbar shows the attached window.
/// Attach a window to a specified tab. When the tab is activated, tabbar shows the attached window.
/**
* @param pos The position of tab to set the attached window.
* @param attach_wd A handle to the window to be set.
@ -363,7 +363,7 @@ namespace nana
namespace nana
{
{
namespace drawerbase
{
namespace tabbar_lite