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

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

Browse Source
This commit is contained in:
Jinhao 2018-03-07 11:30:39 +08:00
commit 9f991b3ac7
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1411,6 +1411,8 @@ the nana::detail::basic_window member pointer scheme
size_type append_header(std::string text_utf8, unsigned width = 120); size_type append_header(std::string text_utf8, unsigned width = 120);
size_type append_header(std::wstring text, unsigned width = 120); size_type append_header(std::wstring text, unsigned width = 120);
void clear_headers(); ///< Removes all the columns.
cat_proxy append(std::string category); ///< Appends a new category to the end cat_proxy append(std::string category); ///< Appends a new category to the end
cat_proxy append(std::wstring category); ///< Appends a new category to the end cat_proxy append(std::wstring category); ///< Appends a new category to the end
void append(std::initializer_list<std::string> categories); ///< Appends categories to the end void append(std::initializer_list<std::string> categories); ///< Appends categories to the end

1
include/nana/gui/widgets/menubar.hpp
View File

@ -95,6 +95,7 @@ namespace nana
menu& push_back(const std::string&); ///< Appends a new (empty) menu. menu& push_back(const std::string&); ///< Appends a new (empty) menu.
menu& at(size_t index) const; ///< Gets the menu specified by index. menu& at(size_t index) const; ///< Gets the menu specified by index.
std::size_t length() const; ///< Number of menus. std::size_t length() const; ///< Number of menus.
void clear(); ///< Removes all the menus.
/// Deselects the menu /// Deselects the menu
/** /**

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

@ -307,6 +307,11 @@ namespace nana
return cont_.back().index; return cont_.back().index;
} }
void clear()
{
cont_.clear();
}
unsigned pixels() const noexcept ///< the visible width of the whole header unsigned pixels() const noexcept ///< the visible width of the whole header
{ {
unsigned pixels = 0; unsigned pixels = 0;
@ -5319,6 +5324,15 @@ namespace nana
return pos; return pos;
} }
void listbox::clear_headers()
{
internal_scope_guard lock;
auto & ess = _m_ess();
ess.lister.erase();
ess.header.clear();
ess.update();
}
listbox::cat_proxy listbox::append(std::string s) listbox::cat_proxy listbox::append(std::string s)
{ {
internal_scope_guard lock; internal_scope_guard lock;

7
source/gui/widgets/menubar.cpp
View File

@ -626,6 +626,13 @@ namespace nana
return get_drawer_trigger().ess().items.size(); return get_drawer_trigger().ess().items.size();
} }
void menubar::clear()
{
internal_scope_guard lock;
get_drawer_trigger().ess().items.clear();
API::refresh_window(handle());
}
bool menubar::cancel() bool menubar::cancel()
{ {
return get_drawer_trigger().ess().cancel(); return get_drawer_trigger().ess().cancel();