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

Merge remote-tracking branch 'nana/hotfixes-1.0.1' into develop_nana

Browse Source
This commit is contained in:
qPCR4vir
2015-03-11 02:21:56 +01:00
parent b62cbc1cf3 2c5283eb78
commit b74f6d86da
6 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/gui/widgets/picture.hpp
View File

@@ -34,7 +34,7 @@ namespace nana
void attached(widget_reference, graph_reference) override;
private:
void refresh(graph_reference) override;
void _m_draw_background();
void _m_draw_background(unsigned,unsigned);
private:
implement * const impl_;
};

5
include/nana/paint/image.hpp
View File

@@ -1,6 +1,7 @@
/*
* Paint Image Implementation
* Copyright(C) 2003-2013 Jinhao(cnjinhao@hotmail.com)
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@@ -39,6 +40,8 @@ namespace paint
bool empty() const;
operator unspecified_bool_t() const;
void close();
bool alpha() const;
nana::size size() const;
void paste(graphics& dst, int x, int y) const;
void paste(const nana::rectangle& r_src, graphics& dst, const point& p_dst) const;///< Paste the area of picture specified by r_src into the destination graphics specified by dst at position p_dst.