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

arg_category is renamed arg_listbox_category

Browse Source
This commit is contained in:
Jinhao
2016-02-15 01:15:40 +08:00
parent 898ec72ed9
commit 7aa9d9e373
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -478,7 +478,7 @@ namespace nana
}; };
/// The event argument type for listbox's category_dbl_click /// The event argument type for listbox's category_dbl_click
struct arg_category struct arg_listbox_category
: public event_arg : public event_arg
{ {
drawerbase::listbox::cat_proxy category; drawerbase::listbox::cat_proxy category;
@@ -489,7 +489,7 @@ namespace nana
/// Determines whether expension/shrink of category is blocked /// Determines whether expension/shrink of category is blocked
bool category_change_blocked() const noexcept; bool category_change_blocked() const noexcept;
arg_category(const drawerbase::listbox::cat_proxy&) noexcept; arg_listbox_category(const drawerbase::listbox::cat_proxy&) noexcept;
private: private:
mutable bool block_change_; mutable bool block_change_;
}; };
@@ -505,7 +505,7 @@ namespace nana
basic_event<arg_listbox> selected; basic_event<arg_listbox> selected;
/// An event occurs when a listbox category is double clicking. /// An event occurs when a listbox category is double clicking.
basic_event<arg_category> category_dbl_click; basic_event<arg_listbox_category> category_dbl_click;
}; };
struct scheme struct scheme

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

@@ -3571,10 +3571,10 @@ namespace nana
if (!item_pos.is_category()) //being the npos of item.second is a category if (!item_pos.is_category()) //being the npos of item.second is a category
return; return;
arg_category ai(cat_proxy(essence_, item_pos.cat)); arg_listbox_category arg_cat(cat_proxy(essence_, item_pos.cat));
lister.wd_ptr()->events().category_dbl_click.emit(ai); lister.wd_ptr()->events().category_dbl_click.emit(arg_cat);
if(!ai.category_change_blocked()){ if (!arg_cat.category_change_blocked()){
bool do_expand = (lister.expand(item_pos.cat) == false); bool do_expand = (lister.expand(item_pos.cat) == false);
lister.expand(item_pos.cat, do_expand); lister.expand(item_pos.cat, do_expand);
@@ -4299,17 +4299,17 @@ namespace nana
//Implementation of arg_category //Implementation of arg_category
//Contributed by leobackes(pr#97) //Contributed by leobackes(pr#97)
arg_category::arg_category ( const nana::drawerbase::listbox::cat_proxy& cat ) noexcept arg_listbox_category::arg_listbox_category(const nana::drawerbase::listbox::cat_proxy& cat) noexcept
: category(cat), block_change_(false) : category(cat), block_change_(false)
{ {
} }
void arg_category::block_category_change() const noexcept void arg_listbox_category::block_category_change() const noexcept
{ {
block_change_ = true; block_change_ = true;
} }
bool arg_category::category_change_blocked() const noexcept bool arg_listbox_category::category_change_blocked() const noexcept
{ {
return block_change_; return block_change_;
} }