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

Merge branch 'hotfix-1.1.3' into feature-docker-place

Browse Source
This commit is contained in:
Jinhao
2015-09-11 00:41:50 +08:00
parent 65a876cc74 edd7de4e8b
commit 706ff76b98
5 changed files with 86 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/gui/detail/drawer.hpp
View File

@@ -16,7 +16,7 @@
#include <vector>
#include "general_events.hpp"
#include <nana/paint/graphics.hpp>
#include <nana/paint/image.hpp>
//#include <nana/paint/image.hpp> //deprecated
#include <functional>
namespace nana

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

@@ -185,7 +185,7 @@ namespace nana
public:
trigger();
~trigger();
essence_t& essence();
//essence_t& essence(); //deprecated
essence_t& essence() const;
void draw();
private:
@@ -618,7 +618,7 @@ By \a clicking on one header the list get \a reordered, first up, and then down
{
typedef typename nana::detail::type_escape<Key>::type key_t;
nana::key<key_t, std::less<key_t> > key(kv);
_m_ease_key(&key);
_m_erase_key(&key);
}
template<typename Key>
@@ -626,7 +626,7 @@ By \a clicking on one header the list get \a reordered, first up, and then down
{
typedef typename nana::detail::type_escape<Key>::type key_t;
nana::key<key_t, std::less<key_t> > key(std::move(kv));
_m_ease_key(&key);
_m_erase_key(&key);
}
bool sortable() const;
@@ -661,7 +661,7 @@ By \a clicking on one header the list get \a reordered, first up, and then down
drawerbase::listbox::essence_t & _m_ess() const;
nana::any* _m_anyobj(size_type cat, size_type index, bool allocate_if_empty) const;
drawerbase::listbox::category_t* _m_at_key(std::shared_ptr<nana::detail::key_interface>);
void _m_ease_key(nana::detail::key_interface*);
void _m_erase_key(nana::detail::key_interface*);
};
namespace dev