Merge cnjinhao/develop

This commit is contained in:
Leonardo Backes Vargas
2016-01-11 23:28:20 -02:00
parent 3f1991ba1a
commit 4609bfc458
2 changed files with 42 additions and 16 deletions

View File

@@ -474,15 +474,14 @@ namespace nana
arg_listbox(const drawerbase::listbox::item_proxy&, bool selected);
};
struct arg_item
struct arg_category
: public event_arg
{
drawerbase::listbox::index_pair item;
drawerbase::listbox::size_type column;
drawerbase::listbox::cat_proxy category;
void block_category_change() const;
bool category_change_blocked() const;
arg_item(const drawerbase::listbox::index_pair&, drawerbase::listbox::size_type column);
arg_category(const drawerbase::listbox::cat_proxy&);
private:
mutable bool _m_block_change;
};
@@ -496,7 +495,7 @@ namespace nana
{
basic_event<arg_listbox> checked;
basic_event<arg_listbox> selected;
basic_event<arg_item> item_dbl_click;
basic_event<arg_category> category_dbl_click;
};
struct scheme
@@ -628,6 +627,9 @@ By \a clicking on one header the list get \a reordered, first up, and then down
}
item_proxy at(const index_pair &abs_pos) const;
index_pair at(const point & pos) const;
columns_indexs column_from_pos(const point & pos);
void insert(const index_pair&, ::std::string); ///<Insert a new item with a text in the first column.
void insert(const index_pair&, ::std::wstring); ///<Insert a new item with a text in the first column.