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

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

Browse Source
This commit is contained in:
Jinhao
2018-01-22 06:13:23 +08:00
parent 0196d2583a 710880372b
commit a62e872ded
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -276,7 +276,7 @@ namespace nana
this->get_drawer_trigger().insert(::nana::npos, to_nstring(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);
API::update_window(*this); API::update_window(*this);
return *this; return *this;
} }
@@ -292,7 +292,7 @@ namespace nana
if (pos > length()) if (pos > length())
throw std::out_of_range("tabbar::insert invalid position"); 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); API::update_window(*this);
} }
@@ -305,7 +305,7 @@ namespace nana
API::update_window(*this); 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 pos The position of tab to set the attached window.
* @param attach_wd A handle to the window to be set. * @param attach_wd A handle to the window to be set.
@@ -363,7 +363,7 @@ namespace nana
namespace nana namespace nana
{ {
namespace drawerbase namespace drawerbase
{ {
namespace tabbar_lite namespace tabbar_lite