merge beru's changes

2015-08-02 03:33:43 +08:00
parent 66c1e1ad98
commit e0ee42d184
18 changed files with 59 additions and 86 deletions
--- a/source/paint/detail/image_ico.hpp
+++ b/source/paint/detail/image_ico.hpp
@@ -24,7 +24,7 @@ namespace nana{	namespace paint


 			bool open(const nana::char_t* filename) override;
-			bool open(const void* data, std::size_t bytes);
+			bool open(const void* data, std::size_t bytes) override;
 			bool alpha_channel() const override;
 			bool empty() const override;
 			void close() override;