Merge branch 'hotfix-1.1.3' into develop

2015-10-07 03:15:03 +08:00
parent 2f47e89af1 1ea2028233
commit c6f13c1748
6 changed files with 218 additions and 286 deletions
--- a/include/nana/gui/widgets/listbox.hpp
+++ b/include/nana/gui/widgets/listbox.hpp
@@ -185,9 +185,7 @@ namespace nana
 			public:
 				trigger();
 				~trigger();
-				//essence_t& essence();	//deprecated
 				essence_t& essence() const;
-				void draw();
 			private:
 				void _m_draw_border();
 			private: