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

Merge branch 'develop' of https://github.com/beru/nana into beru-develop

Browse Source 
Conflicts:
	source/gui/widgets/skeletons/text_editor.cpp
	source/gui/widgets/textbox.cpp
	source/paint/detail/image_bmp.hpp
	source/paint/detail/image_ico.hpp
This commit is contained in:
Jinhao
2015-08-01 22:08:06 +08:00
parent abdf93a862 0e024d3227
commit 7d868f2377
22 changed files with 322 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/paint/detail/image_ico.hpp
View File

@@ -22,14 +22,15 @@ namespace nana{ namespace paint
public:
image_ico(bool is_ico);
bool open(const nana::char_t* filename) override;
bool open(const void* data, std::size_t bytes);
bool alpha_channel() const override;
bool empty() const override;
void close() override;
nana::size size() const override;
virtual void paste(const nana::rectangle& src_r, graph_reference graph, const point& p_dst) const override;
virtual void stretch(const nana::rectangle&, graph_reference graph, const nana::rectangle& r) const override;
const ptr_t & ptr() const;
private:
const bool is_ico_;