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

Merge branch 'hotfix-1.5.1' into develop

Browse Source
This commit is contained in:
Jinhao
2017-06-08 21:40:32 +08:00
parent 4d93c97c44 bd38e96ed7
commit 3cefaa3506
11 changed files with 43 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/gui/widgets/listbox.hpp
View File

@@ -893,7 +893,7 @@ namespace nana
}
template<typename T>
T* value_ptr() const
T const * value_ptr() const
{
return any_cast<T>(_m_value());
}

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

@@ -237,9 +237,9 @@ namespace nana
return this->get_drawer_trigger().activated();
}
value_type & at(std::size_t pos) const /// Returns pos'th element
value_type const & at(std::size_t pos) const /// Returns pos'th element
{
return static_cast<value_type&>(this->get_drawer_trigger().at(pos));
return any_cast<value_type&>(this->get_drawer_trigger().at(pos));
}
void close_fly(bool fly) /// Draw or not a close button in each tab.